Cosmetic changes to tests to make it easier to concatenate them.

test/cctest/test-threads.cc

 // Copyright 2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 14 matching lines @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "src/v8.h"
 #include "test/cctest/cctest.h"
 
 #include "src/base/platform/platform.h"
 #include "src/isolate.h"
 
 
-enum Turn {
-  FILL_CACHE,
-  CLEAN_CACHE,
-  SECOND_TIME_FILL_CACHE,
-  DONE
-};
+enum Turn { FILL_CACHE, CLEAN_CACHE, SECOND_TIME_FILL_CACHE, CACHE_DONE };
 
 static Turn turn = FILL_CACHE;
 
 
 class ThreadA : public v8::base::Thread {
  public:
   ThreadA() : Thread(Options("ThreadA")) {}
   void Run() {
     v8::Isolate* isolate = CcTest::isolate();
     v8::Locker locker(isolate);
@@ skipping 18 matching lines @@
     turn = CLEAN_CACHE;
     do {
       {
         v8::Unlocker unlocker(CcTest::isolate());
       }
     } while (turn != SECOND_TIME_FILL_CACHE);
 
     // Rerun the script.
     CHECK(script->Run()->IsTrue());
 
-    turn = DONE;
+    turn = CACHE_DONE;
   }
 };
 
 
 class ThreadB : public v8::base::Thread {
  public:
   ThreadB() : Thread(Options("ThreadB")) {}
   void Run() {
     do {
       {
@@ skipping 19 matching lines @@
 TEST(JSFunctionResultCachesInTwoThreads) {
   ThreadA threadA;
   ThreadB threadB;
 
   threadA.Start();
   threadB.Start();
 
   threadA.Join();
   threadB.Join();
 
-  CHECK_EQ(DONE, turn);
+  CHECK_EQ(CACHE_DONE, turn);
 }
 
 class ThreadIdValidationThread : public v8::base::Thread {
  public:
   ThreadIdValidationThread(v8::base::Thread* thread_to_start,
                            i::List<i::ThreadId>* refs, unsigned int thread_no,
                            v8::base::Semaphore* semaphore)
       : Thread(Options("ThreadRefValidationThread")),
         refs_(refs),
         thread_no_(thread_no),
@@ skipping 35 matching lines @@
     refs.Add(i::ThreadId::Invalid());
   }
   prev->Start();
   for (int i = 0; i < kNThreads; i++) {
     semaphore.Wait();
   }
   for (int i = 0; i < kNThreads; i++) {
     delete threads[i];
   }
 }