Index: test/unittests/compiler-dispatcher/compiler-dispatcher-job-unittest.cc |
diff --git a/test/unittests/compiler-dispatcher/compiler-dispatcher-job-unittest.cc b/test/unittests/compiler-dispatcher/compiler-dispatcher-job-unittest.cc |
index e1101dfe31f6c49bec3b44c50fd401c34cdebf23..ecd5c0b00db070427056306a4772a5e358f542f4 100644 |
--- a/test/unittests/compiler-dispatcher/compiler-dispatcher-job-unittest.cc |
+++ b/test/unittests/compiler-dispatcher/compiler-dispatcher-job-unittest.cc |
@@ -137,7 +137,9 @@ TEST_F(CompilerDispatcherJobTest, StateTransitions) { |
job->Parse(); |
ASSERT_TRUE(job->status() == CompileJobStatus::kParsed); |
ASSERT_TRUE(job->FinalizeParsingOnMainThread()); |
- ASSERT_TRUE(job->status() == CompileJobStatus::kReadyToAnalyse); |
+ ASSERT_TRUE(job->status() == CompileJobStatus::kReadyToAnalyze); |
+ ASSERT_TRUE(job->AnalyzeOnMainThread()); |
+ ASSERT_TRUE(job->status() == CompileJobStatus::kAnalyzed); |
ASSERT_TRUE(job->PrepareToCompileOnMainThread()); |
ASSERT_TRUE(job->status() == CompileJobStatus::kReadyToCompile); |
job->Compile(); |
@@ -178,6 +180,7 @@ TEST_F(CompilerDispatcherJobTest, ScopeChain) { |
job->PrepareToParseOnMainThread(); |
job->Parse(); |
ASSERT_TRUE(job->FinalizeParsingOnMainThread()); |
+ ASSERT_TRUE(job->AnalyzeOnMainThread()); |
ASSERT_TRUE(job->PrepareToCompileOnMainThread()); |
ASSERT_TRUE(job->status() == CompileJobStatus::kReadyToCompile); |
@@ -214,6 +217,7 @@ TEST_F(CompilerDispatcherJobTest, CompileAndRun) { |
job->PrepareToParseOnMainThread(); |
job->Parse(); |
job->FinalizeParsingOnMainThread(); |
+ job->AnalyzeOnMainThread(); |
job->PrepareToCompileOnMainThread(); |
job->Compile(); |
ASSERT_TRUE(job->FinalizeCompilingOnMainThread()); |
@@ -226,7 +230,7 @@ TEST_F(CompilerDispatcherJobTest, CompileAndRun) { |
ASSERT_TRUE(job->status() == CompileJobStatus::kInitial); |
} |
-TEST_F(CompilerDispatcherJobTest, CompileFailureToPrepare) { |
+TEST_F(CompilerDispatcherJobTest, CompileFailureToAnalyse) { |
std::string raw_script("() { var a = "); |
for (int i = 0; i < 100000; i++) { |
raw_script += "'x' + "; |
@@ -240,7 +244,7 @@ TEST_F(CompilerDispatcherJobTest, CompileFailureToPrepare) { |
job->PrepareToParseOnMainThread(); |
job->Parse(); |
job->FinalizeParsingOnMainThread(); |
- ASSERT_FALSE(job->PrepareToCompileOnMainThread()); |
+ ASSERT_FALSE(job->AnalyzeOnMainThread()); |
ASSERT_TRUE(job->status() == CompileJobStatus::kFailed); |
ASSERT_TRUE(i_isolate()->has_pending_exception()); |
@@ -263,6 +267,7 @@ TEST_F(CompilerDispatcherJobTest, CompileFailureToFinalize) { |
job->PrepareToParseOnMainThread(); |
job->Parse(); |
job->FinalizeParsingOnMainThread(); |
+ job->AnalyzeOnMainThread(); |
job->PrepareToCompileOnMainThread(); |
job->Compile(); |
ASSERT_FALSE(job->FinalizeCompilingOnMainThread()); |
@@ -307,6 +312,7 @@ TEST_F(IgnitionCompilerDispatcherJobTest, CompileOnBackgroundThread) { |
job->PrepareToParseOnMainThread(); |
job->Parse(); |
job->FinalizeParsingOnMainThread(); |
+ job->AnalyzeOnMainThread(); |
job->PrepareToCompileOnMainThread(); |
ASSERT_TRUE(job->can_compile_on_background_thread()); |
@@ -340,6 +346,7 @@ TEST_F(CompilerDispatcherJobTest, LazyInnerFunctions) { |
job->PrepareToParseOnMainThread(); |
job->Parse(); |
ASSERT_TRUE(job->FinalizeParsingOnMainThread()); |
+ ASSERT_TRUE(job->AnalyzeOnMainThread()); |
ASSERT_TRUE(job->PrepareToCompileOnMainThread()); |
job->Compile(); |
ASSERT_TRUE(job->FinalizeCompilingOnMainThread()); |