Move C++ js bindings tests to mojo/bindings/js/tests

The C++ code used to implement these bindings tests is not part of the SDK. R=abarth@chromium.org TBR=darin@chromium.org for moving a DEPS file around Review URL: https://codereview.chromium.org/622943002 Cr-Commit-Position: refs/heads/master@{#297971}
Denger-Network · Oct 3, 2014 · c01b00f · c01b00f
1 parent d13162c
commit c01b00f
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 36 deletions.
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
@@ -38,14 +38,14 @@ group("tests") {
   deps = [
     "//mojo/application_manager:mojo_application_manager_unittests",
     "//mojo/apps/js/test:mojo_apps_js_unittests",
+    "//mojo/bindings/js/tests:mojo_js_unittests",
     "//mojo/common:mojo_common_unittests",
     "//mojo/public/c/system/tests:perftests",
     "//mojo/public/cpp/application/tests:mojo_public_application_unittests",
     "//mojo/public/cpp/bindings/tests:mojo_public_bindings_unittests",
     "//mojo/public/cpp/environment/tests:mojo_public_environment_unittests",
     "//mojo/public/cpp/system/tests:mojo_public_system_unittests",
     "//mojo/public/cpp/utility/tests:mojo_public_utility_unittests",
-    "//mojo/public/js/bindings/tests:mojo_js_unittests",
     "//mojo/services/clipboard:mojo_clipboard_unittests",
     "//mojo/services/public/cpp/surfaces/tests:mojo_surfaces_lib_unittests",
     "//mojo/shell:mojo_external_application_tests",

diff --git a/mojo/public/js/bindings/tests/BUILD.gn → mojo/bindings/js/tests/BUILD.gn b/mojo/public/js/bindings/tests/BUILD.gn → mojo/bindings/js/tests/BUILD.gn
diff --git a/mojo/public/js/bindings/tests/DEPS → mojo/bindings/js/tests/DEPS b/mojo/public/js/bindings/tests/DEPS → mojo/bindings/js/tests/DEPS
diff --git a/.../public/js/bindings/tests/run_js_tests.cc → mojo/bindings/js/tests/run_js_tests.cc b/.../public/js/bindings/tests/run_js_tests.cc → mojo/bindings/js/tests/run_js_tests.cc
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
@@ -41,6 +41,7 @@
         'mojo_html_viewer',
         'mojo_js_content_handler',
         'mojo_js_standalone',
+        'mojo_js_unittests',
         'mojo_native_viewport_service',
         'mojo_network_service',
         'mojo_pepper_container_app',
@@ -373,6 +374,23 @@
         'cc/output_surface_mojo.h',
       ],
     },
+    {
+      # GN version: //mojo/bindings/js/tests:mojo_js_unittests
+      'target_name': 'mojo_js_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../gin/gin.gyp:gin_test',
+        'mojo_base.gyp:mojo_common_test_support',
+        'mojo_base.gyp:mojo_environment_standalone',
+        'mojo_base.gyp:mojo_js_bindings_lib',
+        'mojo_base.gyp:mojo_public_test_interfaces',
+        'mojo_base.gyp:mojo_run_all_unittests',
+        'mojo_base.gyp:mojo_utility',
+      ],
+      'sources': [
+        'bindings/js/tests/run_js_tests.cc',
+      ],
+    },
   ],
   'conditions': [
     ['OS=="android"', {
@@ -665,5 +683,22 @@
         },
       ],
     }],
+    ['test_isolation_mode != "noop"', {
+      'targets': [
+        {
+          'target_name': 'mojo_js_unittests_run',
+          'type': 'none',
+          'dependencies': [
+            'mojo_js_unittests',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+          ],
+          'sources': [
+            'mojo_js_unittests.isolate',
+          ],
+        },
+      ],
+    }],
   ],
 }
diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp
@@ -25,7 +25,6 @@
         'mojo_common_unittests',
         'mojo_cpp_bindings',
         'mojo_js_bindings',
-        'mojo_js_unittests',
         'mojo_message_generator',
         'mojo_message_pipe_perftests',
         'mojo_public_application_unittests',
@@ -639,22 +638,5 @@
         },
       ]
     }],
-    ['test_isolation_mode != "noop"', {
-      'targets': [
-        {
-          'target_name': 'mojo_js_unittests_run',
-          'type': 'none',
-          'dependencies': [
-            'mojo_js_unittests',
-          ],
-          'includes': [
-            '../build/isolate.gypi',
-          ],
-          'sources': [
-            'mojo_js_unittests.isolate',
-          ],
-        },
-      ],
-    }],
   ]
 }
diff --git a/mojo/mojo_public_tests.gypi b/mojo/mojo_public_tests.gypi
@@ -213,22 +213,5 @@
         'mojo_cpp_bindings',
       ],
     },
-    {
-      # GN version: //mojo/public/js/bindings/tests:mojo_js_unittests
-      'target_name': 'mojo_js_unittests',
-      'type': 'executable',
-      'dependencies': [
-        '../gin/gin.gyp:gin_test',
-        'mojo_common_test_support',
-        'mojo_environment_standalone',
-        'mojo_js_bindings_lib',
-        'mojo_public_test_interfaces',
-        'mojo_run_all_unittests',
-        'mojo_utility',
-      ],
-      'sources': [
-        'public/js/bindings/tests/run_js_tests.cc',
-      ],
-    },
   ],
 }