Merge base unit tests into src to be in line with Chrome.

We still need the test/base-unittests folder until the test driver is
updated to handle unittests without the boilerplate.

TEST=base-unittests
R=svenpanne@chromium.org
BUG=v8:3489
LOG=n

Review URL: https://codereview.chromium.org/520503004

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23516 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/build/all.gyp b/build/all.gyp
index 29fcb17..6ac415a 100644 (file)
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -9,8 +9,8 @@
       'type': 'none',
       'dependencies': [
         '../samples/samples.gyp:*',
+        '../src/base/base.gyp:*',
         '../src/d8.gyp:d8',
-        '../test/base-unittests/base-unittests.gyp:*',
         '../test/cctest/cctest.gyp:*',
         '../test/compiler-unittests/compiler-unittests.gyp:*',
         '../test/heap-unittests/heap-unittests.gyp:*',

diff --git a/src/DEPS b/src/DEPS
index f38a902..260f5b2 100644 (file)
--- a/src/DEPS
+++ b/src/DEPS
@@ -4,6 +4,7 @@ include_rules = [
   "+src/compiler/pipeline.h",
   "-src/libplatform",
   "-include/libplatform",
+  "+testing",
 ]
 
 specific_include_rules = {

diff --git a/test/base-unittests/base-unittests.gyp b/src/base/base.gyp
similarity index 100%
rename from test/base-unittests/base-unittests.gyp
rename to src/base/base.gyp

diff --git a/test/base-unittests/bits-unittest.cc b/src/base/bits-unittest.cc
similarity index 100%
rename from test/base-unittests/bits-unittest.cc
rename to src/base/bits-unittest.cc

diff --git a/test/base-unittests/cpu-unittest.cc b/src/base/cpu-unittest.cc
similarity index 100%
rename from test/base-unittests/cpu-unittest.cc
rename to src/base/cpu-unittest.cc

diff --git a/test/base-unittests/flags-unittest.cc b/src/base/flags-unittest.cc
similarity index 100%
rename from test/base-unittests/flags-unittest.cc
rename to src/base/flags-unittest.cc

diff --git a/test/base-unittests/platform/condition-variable-unittest.cc b/src/base/platform/condition-variable-unittest.cc
similarity index 96%
rename from test/base-unittests/platform/condition-variable-unittest.cc
rename to src/base/platform/condition-variable-unittest.cc
index ea1efd0..9c2f9ef 100644 (file)
--- a/test/base-unittests/platform/condition-variable-unittest.cc
+++ b/src/base/platform/condition-variable-unittest.cc
@@ -54,7 +54,7 @@ class ThreadWithMutexAndConditionVariable V8_FINAL : public Thread {
   Mutex mutex_;
 };
 
-}
+}  // namespace
 
 
 TEST(ConditionVariable, MultipleThreadsWithSeparateConditionVariables) {
@@ -135,7 +135,7 @@ class ThreadWithSharedMutexAndConditionVariable V8_FINAL : public Thread {
   Mutex* mutex_;
 };
 
-}
+}  // namespace
 
 
 TEST(ConditionVariable, MultipleThreadsWithSharedSeparateConditionVariables) {
@@ -263,7 +263,7 @@ class LoopIncrementThread V8_FINAL : public Thread {
   Mutex* mutex_;
 };
 
-}
+}  // namespace
 
 
 TEST(ConditionVariable, LoopIncrement) {
@@ -275,10 +275,10 @@ TEST(ConditionVariable, LoopIncrement) {
     int counter = 0;
 
     // Setup the threads.
-    Thread** threads = new Thread*[thread_count];
+    Thread** threads = new Thread* [thread_count];
     for (int n = 0; n < thread_count; ++n) {
-      threads[n] = new LoopIncrementThread(
-          n, &counter, limit, thread_count, &cv, &mutex);
+      threads[n] = new LoopIncrementThread(n, &counter, limit, thread_count,
+                                           &cv, &mutex);
     }
 
     // Start all threads.

diff --git a/test/base-unittests/platform/mutex-unittest.cc b/src/base/platform/mutex-unittest.cc
similarity index 100%
rename from test/base-unittests/platform/mutex-unittest.cc
rename to src/base/platform/mutex-unittest.cc

diff --git a/test/base-unittests/platform/platform-unittest.cc b/src/base/platform/platform-unittest.cc
similarity index 98%
rename from test/base-unittests/platform/platform-unittest.cc
rename to src/base/platform/platform-unittest.cc
index b0cd4e1..58ce5b6 100644 (file)
--- a/test/base-unittests/platform/platform-unittest.cc
+++ b/src/base/platform/platform-unittest.cc
@@ -36,7 +36,7 @@ class SelfJoinThread V8_FINAL : public Thread {
   virtual void Run() V8_OVERRIDE { Join(); }
 };
 
-}
+}  // namespace
 
 
 TEST(Thread, SelfJoin) {
@@ -97,7 +97,7 @@ class ThreadLocalStorageTest : public Thread, public ::testing::Test {
   Thread::LocalStorageKey keys_[256];
 };
 
-}
+}  // namespace
 
 
 TEST_F(ThreadLocalStorageTest, DoTest) {

diff --git a/test/base-unittests/platform/semaphore-unittest.cc b/src/base/platform/semaphore-unittest.cc
similarity index 100%
rename from test/base-unittests/platform/semaphore-unittest.cc
rename to src/base/platform/semaphore-unittest.cc

diff --git a/test/base-unittests/platform/time-unittest.cc b/src/base/platform/time-unittest.cc
similarity index 99%
rename from test/base-unittests/platform/time-unittest.cc
rename to src/base/platform/time-unittest.cc
index 409323a..b3bfbab 100644 (file)
--- a/test/base-unittests/platform/time-unittest.cc
+++ b/src/base/platform/time-unittest.cc
@@ -139,7 +139,7 @@ static void ResolutionTest(T (*Now)(), TimeDelta target_granularity) {
   EXPECT_LE(delta, target_granularity);
 }
 
-}
+}  // namespace
 
 
 TEST(Time, NowResolution) {

diff --git a/test/base-unittests/sys-info-unittest.cc b/src/base/sys-info-unittest.cc
similarity index 100%
rename from test/base-unittests/sys-info-unittest.cc
rename to src/base/sys-info-unittest.cc

diff --git a/test/base-unittests/utils/random-number-generator-unittest.cc b/src/base/utils/random-number-generator-unittest.cc
similarity index 100%
rename from test/base-unittests/utils/random-number-generator-unittest.cc
rename to src/base/utils/random-number-generator-unittest.cc

diff --git a/test/base-unittests/DEPS b/test/base-unittests/DEPS
deleted file mode 100644 (file)
index 5c0cadf..0000000
--- a/test/base-unittests/DEPS
+++ /dev/null
@@ -1,9 +0,0 @@
-include_rules = [
-  "-include",
-  "+include/v8config.h",
-  "+include/v8stdint.h",
-  "-src",
-  "+src/base",
-  "+testing/gtest",
-  "+testing/gtest-support.h",
-]