chromium/src
0
Fork 0
Code Activity

Isolate gin_unittests and add them to bots

Browse Source 
BUG=389460
R=phajdan.jr@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#363650}
This commit is contained in:
jochen
2015-12-07 16:56:45 -08:00
committed by Commit bot
parent 51914a4be3
commit 656a7c9458
8 changed files with 131 additions and 0 deletions

29
gin/BUILD.gn

@@ -135,6 +135,8 @@ executable("gin_shell") {
"//build/config/sanitizers:deps", "//build/config/sanitizers:deps",
"//v8", "//v8",
] ]
configs += [ "//v8:external_startup_data" ]
} }
source_set("gin_test") { source_set("gin_test") {
@@ -159,6 +161,8 @@ source_set("gin_test") {
deps = [ deps = [
"//v8", "//v8",
] ]
configs += [ "//v8:external_startup_data" ]
} }
test("gin_unittests") { test("gin_unittests") {
@@ -177,8 +181,33 @@ test("gin_unittests") {
] ]
deps = [ deps = [
":gin_shell",
":gin_test", ":gin_test",
"//base/test:test_support", "//base/test:test_support",
"//v8", "//v8",
] ]
configs += [ "//v8:external_startup_data" ]
data = [
"modules/module_registry_unittests.js",
"shell/hello_world.js",
"test/expect.js",
"test/file_unittests.js",
"test/gtest_unittests.js",
"../OWNERS",
]
data_deps = [
":gin_shell",
]
}
# TODO(GYP): Delete this after we've converted everything to GN.
# The _run targets exist only for compatibility w/ GYP.
group("gin_unittests_run") {
testonly = true
deps = [
":gin_unittests",
]
} }

20
gin/gin.gyp

@@ -156,6 +156,7 @@
'dependencies': [ 'dependencies': [
'../base/base.gyp:test_support_base', '../base/base.gyp:test_support_base',
'../v8/tools/gyp/v8.gyp:v8', '../v8/tools/gyp/v8.gyp:v8',
'gin_shell',
'gin_test', 'gin_test',
], ],
'sources': [ 'sources': [
@@ -173,4 +174,23 @@
], ],
}, },
], ],
'conditions': [
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'gin_unittests_run',
'type': 'none',
'dependencies': [
'gin_unittests',
],
'includes': [
'../build/isolate.gypi',
],
'sources': [
'gin_unittests.isolate',
],
},
],
}],
],
} }

56
gin/gin_unittests.isolate Normal file

@@ -0,0 +1,56 @@
# 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.
{
'variables': {
'files': [
'<(PRODUCT_DIR)/gin_shell<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/gin_unittests<(EXECUTABLE_SUFFIX)',
'modules/module_registry_unittests.js',
'shell/hello_world.js',
'test/expect.js',
'test/file_unittests.js',
'test/gtest_unittests.js',
'../OWNERS',
],
},
'conditions': [
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
'../testing/test_env.py',
],
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/gin_unittests<(EXECUTABLE_SUFFIX)',
'--brave-new-test-launcher',
'--test-launcher-bot-mode',
'--asan=<(asan)',
'--msan=<(msan)',
'--tsan=<(tsan)',
],
},
}],
['OS=="mac" and asan==1 and fastbuild==0', {
'variables': {
'files': [
'<(PRODUCT_DIR)/gin_shell.dSYM/',
'<(PRODUCT_DIR)/gin_unittests.dSYM/',
],
},
}],
['OS=="win" and (fastbuild==0 or fastbuild==1)', {
'variables': {
'files': [
'<(PRODUCT_DIR)/gin_shell.exe.pdb',
'<(PRODUCT_DIR)/gin_unittests.exe.pdb',
],
},
}],
],
'includes': [
'../base/base.isolate',
'../gin/v8.isolate',
],
}

4
gin/shell/gin_shell_unittest.cc

@@ -12,7 +12,11 @@
base::FilePath GinShellPath() { base::FilePath GinShellPath() {
base::FilePath dir; base::FilePath dir;
PathService::Get(base::DIR_EXE, &dir); PathService::Get(base::DIR_EXE, &dir);
#if defined(OS_WIN)
return dir.AppendASCII("gin_shell.exe");
#else
return dir.AppendASCII("gin_shell"); return dir.AppendASCII("gin_shell");
#endif
} }
base::FilePath HelloWorldPath() { base::FilePath HelloWorldPath() {

6
testing/buildbot/chromium.linux.json

@@ -461,6 +461,12 @@
}, },
"test": "gfx_unittests" "test": "gfx_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gin_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true

6
testing/buildbot/chromium.mac.json

@@ -759,6 +759,12 @@
}, },
"test": "gfx_unittests" "test": "gfx_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gin_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true

6
testing/buildbot/chromium.win.json

@@ -934,6 +934,12 @@
}, },
"test": "gfx_unittests" "test": "gfx_unittests"
}, },
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gin_unittests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true

4
testing/buildbot/gn_isolate_map.pyl

@@ -193,6 +193,10 @@
"type": "raw", "type": "raw",
"args": [], "args": [],
}, },
"gin_unittests": {
"label": "//gin:gin_unittests",
"type": "console_test_launcher",
},
"gles2_conform_test": { "gles2_conform_test": {
"label": "//gpu/gles2_conform_support:gles2_conform_test", "label": "//gpu/gles2_conform_support:gles2_conform_test",
"type": "console_test_launcher", "type": "console_test_launcher",