Convert Mojo tests to use swarming.

BUG=604847 Review-Url: https://codereview.chromium.org/1918143004 Cr-Commit-Position: refs/heads/master@{#390573}
marcosholgado · Apr 29, 2016 · 98ecd4a · 98ecd4a
1 parent 6684994
commit 98ecd4a
Show file tree

Hide file tree

Showing 29 changed files with 578 additions and 120 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -638,17 +638,34 @@ group("mojo_apptests") {
   testonly = true
 
   deps = []
+  data_deps = []
+  data = []
 
   if (is_win || is_linux) {
-    deps += [
-      "//components/resource_provider:resource_provider_unittests",
-      "//mash:mash_unittests",
-      "//media/mojo/services:tests",
-      "//ui/views/mus:tests",
+    deps += [ "//services/shell/standalone" ]
+    data_deps = [
+      "//media/mojo/services:media_apptests",
+    ]
+    if (is_linux) {
+      data_deps += [ "//tools/xdisplaycheck" ]
+    }
+    data += [
+      "//mojo/tools/apptest_runner.py",
+      "//mojo/tools/data/apptests",
+      "//mojo/tools/mopy/",
+      "//testing/xvfb.py",
+      "//tools/swarming_client/utils/subprocess42.py",
     ]
   }
 }
 
+group("mojo_apptests_run") {
+  testonly = true
+  deps = [
+    ":mojo_apptests",
+  ]
+}
+
 group("gn_only") {
   testonly = true
 

diff --git a/gin/BUILD.gn b/gin/BUILD.gn
@@ -156,6 +156,9 @@ source_set("gin_test") {
     "test/v8_test.cc",
     "test/v8_test.h",
   ]
+  data = [
+    "test/expect.js",
+  ]
 
   public_deps = [
     ":gin",
@@ -195,7 +198,6 @@ test("gin_unittests") {
   data = [
     "modules/module_registry_unittests.js",
     "shell/hello_world.js",
-    "test/expect.js",
     "test/file_unittests.js",
     "test/gtest_unittests.js",
     "../OWNERS",

diff --git a/ipc/mojo/ipc_mojo.gyp b/ipc/mojo/ipc_mojo.gyp
@@ -103,4 +103,23 @@
       ],
     },
   ],
+  'conditions': [
+    ['test_isolation_mode != "noop"', {
+      'targets': [
+        {
+          'target_name': 'ipc_mojo_unittests_run',
+          'type': 'none',
+          'dependencies': [
+            'ipc_mojo_unittests',
+          ],
+          'includes': [
+            '../../build/isolate.gypi',
+          ],
+          'sources': [
+            'ipc_mojo_unittests.isolate',
+          ],
+        },
+      ],
+    }],
+  ],
 }
diff --git a/ipc/mojo/ipc_mojo_unittests.isolate b/ipc/mojo/ipc_mojo_unittests.isolate
@@ -0,0 +1,23 @@
+# Copyright 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+{
+  'includes': [
+    '../../mojo/mojo.isolate',
+  ],
+  'conditions': [
+    ['OS=="win" or OS=="mac" or OS=="linux"', {
+      'variables': {
+        'command': [
+          '../../testing/test_env.py',
+          '<(PRODUCT_DIR)/ipc_mojo_unittests<(EXECUTABLE_SUFFIX)',
+          '--brave-new-test-launcher',
+          '--test-launcher-bot-mode',
+        ],
+        'files': [
+          '../../testing/test_env.py',
+        ],
+      },
+    }],
+  ],
+}
diff --git a/mojo/edk/js/test/BUILD.gn b/mojo/edk/js/test/BUILD.gn
@@ -16,9 +16,11 @@ test("js_unittests") {
     "//mojo/public/cpp/system",
     "//mojo/public/interfaces/bindings/tests:test_interfaces",
     "//mojo/public/interfaces/bindings/tests:test_interfaces_experimental",
+    "//mojo/public/js:tests",
   ]
 
   sources = [
+    "//mojo/edk/js/handle_unittest.cc",
     "run_js_tests.cc",
   ]
 }
@@ -35,6 +37,7 @@ test("js_integration_tests") {
     "//mojo/edk/test:test_support",
     "//mojo/public/cpp/bindings",
     "//mojo/public/interfaces/bindings/tests:test_interfaces",
+    "//mojo/public/js:bindings",
   ]
 
   sources = [

diff --git a/mojo/edk/js/tests/BUILD.gn b/mojo/edk/js/tests/BUILD.gn
@@ -23,6 +23,12 @@ source_set("js_to_cpp_tests") {
     "js_to_cpp_tests.cc",
   ]
 
+  data = [
+    "connection_tests.js",
+    "js_to_cpp_tests.js",
+    "sample_service_tests.js",
+  ]
+
   configs += [ "//v8:external_startup_data" ]
 }
 

diff --git a/mojo/mojo.isolate b/mojo/mojo.isolate
@@ -0,0 +1,31 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+{
+  'includes': [
+    '../base/base.isolate',
+  ],
+  'conditions': [
+    ['OS=="win"', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/mojo_public_test_support.dll',
+        ],
+      },
+    }],
+    ['OS=="linux"', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/lib/libmojo_public_test_support.so',
+        ],
+      },
+    }],
+    ['OS=="mac"', {
+      'variables': {
+        'files': [
+          '<(PRODUCT_DIR)/libmojo_public_test_support.dylib',
+        ],
+      },
+    }],
+  ],
+}
diff --git a/mojo/mojo_common_unittests.isolate b/mojo/mojo_common_unittests.isolate
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 {
   'includes': [
-    '../base/base.isolate',
+    '../mojo/mojo.isolate',
   ],
   'conditions': [
     ['OS=="win" or OS=="mac" or OS=="linux"', {
@@ -19,26 +19,5 @@
         ],
       },
     }],
-    ['OS=="win"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/mojo_public_test_support.dll',
-        ],
-      },
-    }],
-    ['OS=="linux"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/lib/libmojo_public_test_support.so',
-        ],
-      },
-    }],
-    ['OS=="mac"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/libmojo_public_test_support.dylib',
-        ],
-      },
-    }],
   ],
 }
diff --git a/mojo/mojo_edk_tests.gyp b/mojo/mojo_edk_tests.gyp
@@ -326,6 +326,45 @@
             'mojo_public_system_unittests.isolate',
           ],
         },
+        {
+          'target_name': 'mojo_js_unittests_run',
+          'type': 'none',
+          'dependencies': [
+            'mojo_js_unittests',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+          ],
+          'sources': [
+            'mojo_js_unittests.isolate',
+          ],
+        },
+        {
+          'target_name': 'mojo_js_integration_tests_run',
+          'type': 'none',
+          'dependencies': [
+            'mojo_js_integration_tests',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+          ],
+          'sources': [
+            'mojo_js_integration_tests.isolate',
+          ],
+        },
+        {
+          'target_name': 'mojo_system_unittests_run',
+          'type': 'none',
+          'dependencies': [
+            'mojo_system_unittests',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+          ],
+          'sources': [
+            'mojo_system_unittests.isolate',
+          ],
+        },
       ],
     }],
   ],

diff --git a/mojo/mojo_js_integration_tests.isolate b/mojo/mojo_js_integration_tests.isolate
@@ -0,0 +1,49 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+{
+  'includes': [
+    '../gin/v8.isolate',
+    '../mojo/mojo.isolate',
+    '../third_party/icu/icu.isolate',
+  ],
+  'conditions': [
+    ['OS=="win" or OS=="mac" or OS=="linux"', {
+      'variables': {
+        'command': [
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/mojo_js_integration_tests<(EXECUTABLE_SUFFIX)',
+          '--brave-new-test-launcher',
+          '--test-launcher-bot-mode',
+        ],
+        'files': [
+          '../gin/test/expect.js',
+          '../mojo/edk/js/tests/',
+          '../mojo/public/js/',
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/mojo_js_integration_tests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/gen/mojo/common/common_custom_types.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/edk/js/tests/js_to_cpp.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/math_calculator.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/no_module.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/ping_service.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/rect.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/regression_tests.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_factory.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_import.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_import2.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_service.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/scoping.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_constants.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_native_types.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_structs.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_sync_methods.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_unions.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom.js',
+        ],
+      },
+    }],
+  ],
+}
diff --git a/mojo/mojo_js_unittests.isolate b/mojo/mojo_js_unittests.isolate
@@ -3,6 +3,8 @@
 # found in the LICENSE file.
 {
   'includes': [
+    '../gin/v8.isolate',
+    '../mojo/mojo.isolate',
     '../third_party/icu/icu.isolate',
   ],
   'conditions': [
@@ -17,30 +19,26 @@
         'files': [
           '../gin/test/expect.js',
           '../testing/test_env.py',
-          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/',
-          'bindings/js/',
-          'public/js/bindings/',
-        ],
-      },
-    }],
-    ['OS=="win"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/mojo_public_test_support.dll',
-        ],
-      },
-    }],
-    ['OS=="linux"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/lib/libmojo_public_test_support.so',
-        ],
-      },
-    }],
-    ['OS=="mac"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/libmojo_public_test_support.dylib',
+          'public/interfaces/bindings/tests/data/validation/',
+          'public/js/',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/math_calculator.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/no_module.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/ping_service.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/rect.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/regression_tests.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_factory.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_import.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_import2.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/sample_service.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/scoping.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/serialization_test_structs.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_constants.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_native_types.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_structs.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_sync_methods.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/test_unions.mojom.js',
+          '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/validation_test_interfaces.mojom.js',
         ],
       },
     }],

diff --git a/mojo/mojo_public_bindings_unittests.isolate b/mojo/mojo_public_bindings_unittests.isolate
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 {
   'includes': [
-    '../base/base.isolate',
+    '../mojo/mojo.isolate',
   ],
   'conditions': [
     ['OS=="win" or OS=="mac" or OS=="linux"', {
@@ -19,26 +19,5 @@
         ],
       },
     }],
-    ['OS=="win"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/mojo_public_test_support.dll',
-        ],
-      },
-    }],
-    ['OS=="linux"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/lib/libmojo_public_test_support.so',
-        ],
-      },
-    }],
-    ['OS=="mac"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/libmojo_public_test_support.dylib',
-        ],
-      },
-    }],
   ],
 }