Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5000)

Unified Diff: chrome/nacl_integration.isolate

Issue 1240513002: Create nacl_integration.isolate. Base URL: https://chromium.googlesource.com/a/chromium/src.git@4_chrome
Patch Set: Cleaned up Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/nacl_integration.isolate
diff --git a/chrome/chromedriver_unittests.isolate b/chrome/nacl_integration.isolate
similarity index 51%
copy from chrome/chromedriver_unittests.isolate
copy to chrome/nacl_integration.isolate
index 4d5fea4a45d17551cd478f23ab819923d7b4363a..cf48cdd966814e55414e1a5d5d482835463bd953 100644
--- a/chrome/chromedriver_unittests.isolate
+++ b/chrome/nacl_integration.isolate
@@ -6,12 +6,13 @@
['use_x11==0', {
'variables': {
'command': [
- '../testing/test_env.py',
- '<(PRODUCT_DIR)/chromedriver_unittests<(EXECUTABLE_SUFFIX)',
- '--test-launcher-bot-mode',
- '--asan=<(asan)',
- '--msan=<(msan)',
- '--tsan=<(tsan)',
+ '../testing/xvfb.py',
+ '<(PRODUCT_DIR)',
+ '../testing/scripts/nacl_integration.py',
+ '--build-config-fs',
+ '<(CONFIGURATION_NAME)',
+ '--use-src-side-runtest-py',
+ 'run',
],
},
}],
@@ -20,11 +21,11 @@
'command': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)',
- '<(PRODUCT_DIR)/chromedriver_unittests<(EXECUTABLE_SUFFIX)',
- '--test-launcher-bot-mode',
- '--asan=<(asan)',
- '--msan=<(msan)',
- '--tsan=<(tsan)',
+ '../testing/scripts/nacl_integration.py',
+ '--build-config-fs',
+ '<(CONFIGURATION_NAME)',
+ '--use-src-side-runtest-py',
+ 'run',
],
'files': [
'../testing/xvfb.py',
@@ -35,14 +36,18 @@
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'files': [
+ '../native_client/',
+ '../third_party/scons-2.0.1/engine/',
+ '../build/detect_host_arch.py',
+ '../testing/scripts/common.py',
+ '../testing/scripts/nacl_integration.py',
'../testing/test_env.py',
- '<(PRODUCT_DIR)/chromedriver_unittests<(EXECUTABLE_SUFFIX)',
- 'test/data/chromedriver/',
+ 'test/nacl_test_injection/',
],
},
}],
],
'includes': [
- '../base/base.isolate',
+ 'chrome.isolate',
],
}
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698