| Index: test/cctest/test-api.cc
|
| diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
|
| index a1b05f901d0a52d67b14b04753ddf25c93d15806..bc0a4313e2048b7363245150520aa224d11c0ab0 100644
|
| --- a/test/cctest/test-api.cc
|
| +++ b/test/cctest/test-api.cc
|
| @@ -19332,7 +19332,6 @@ TEST(IsolateDifferentContexts) {
|
| class InitDefaultIsolateThread : public v8::internal::Thread {
|
| public:
|
| enum TestCase {
|
| - IgnoreOOM,
|
| SetResourceConstraints,
|
| SetFatalHandler,
|
| SetCounterFunction,
|
| @@ -19349,34 +19348,30 @@ class InitDefaultIsolateThread : public v8::internal::Thread {
|
| v8::Isolate* isolate = v8::Isolate::New();
|
| isolate->Enter();
|
| switch (testCase_) {
|
| - case IgnoreOOM:
|
| - v8::V8::IgnoreOutOfMemoryException();
|
| - break;
|
| -
|
| - case SetResourceConstraints: {
|
| - static const int K = 1024;
|
| - v8::ResourceConstraints constraints;
|
| - constraints.set_max_young_space_size(256 * K);
|
| - constraints.set_max_old_space_size(4 * K * K);
|
| - v8::SetResourceConstraints(CcTest::isolate(), &constraints);
|
| - break;
|
| - }
|
| + case SetResourceConstraints: {
|
| + static const int K = 1024;
|
| + v8::ResourceConstraints constraints;
|
| + constraints.set_max_young_space_size(256 * K);
|
| + constraints.set_max_old_space_size(4 * K * K);
|
| + v8::SetResourceConstraints(CcTest::isolate(), &constraints);
|
| + break;
|
| + }
|
|
|
| - case SetFatalHandler:
|
| - v8::V8::SetFatalErrorHandler(NULL);
|
| - break;
|
| + case SetFatalHandler:
|
| + v8::V8::SetFatalErrorHandler(NULL);
|
| + break;
|
|
|
| - case SetCounterFunction:
|
| - v8::V8::SetCounterFunction(NULL);
|
| - break;
|
| + case SetCounterFunction:
|
| + v8::V8::SetCounterFunction(NULL);
|
| + break;
|
|
|
| - case SetCreateHistogramFunction:
|
| - v8::V8::SetCreateHistogramFunction(NULL);
|
| - break;
|
| + case SetCreateHistogramFunction:
|
| + v8::V8::SetCreateHistogramFunction(NULL);
|
| + break;
|
|
|
| - case SetAddHistogramSampleFunction:
|
| - v8::V8::SetAddHistogramSampleFunction(NULL);
|
| - break;
|
| + case SetAddHistogramSampleFunction:
|
| + v8::V8::SetAddHistogramSampleFunction(NULL);
|
| + break;
|
| }
|
| isolate->Exit();
|
| isolate->Dispose();
|
| @@ -19400,31 +19395,26 @@ static void InitializeTestHelper(InitDefaultIsolateThread::TestCase testCase) {
|
|
|
|
|
| TEST(InitializeDefaultIsolateOnSecondaryThread1) {
|
| - InitializeTestHelper(InitDefaultIsolateThread::IgnoreOOM);
|
| -}
|
| -
|
| -
|
| -TEST(InitializeDefaultIsolateOnSecondaryThread2) {
|
| InitializeTestHelper(InitDefaultIsolateThread::SetResourceConstraints);
|
| }
|
|
|
|
|
| -TEST(InitializeDefaultIsolateOnSecondaryThread3) {
|
| +TEST(InitializeDefaultIsolateOnSecondaryThread2) {
|
| InitializeTestHelper(InitDefaultIsolateThread::SetFatalHandler);
|
| }
|
|
|
|
|
| -TEST(InitializeDefaultIsolateOnSecondaryThread4) {
|
| +TEST(InitializeDefaultIsolateOnSecondaryThread3) {
|
| InitializeTestHelper(InitDefaultIsolateThread::SetCounterFunction);
|
| }
|
|
|
|
|
| -TEST(InitializeDefaultIsolateOnSecondaryThread5) {
|
| +TEST(InitializeDefaultIsolateOnSecondaryThread4) {
|
| InitializeTestHelper(InitDefaultIsolateThread::SetCreateHistogramFunction);
|
| }
|
|
|
|
|
| -TEST(InitializeDefaultIsolateOnSecondaryThread6) {
|
| +TEST(InitializeDefaultIsolateOnSecondaryThread5) {
|
| InitializeTestHelper(InitDefaultIsolateThread::SetAddHistogramSampleFunction);
|
| }
|
|
|
|
|