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

Unified Diff: testing/chromoting/chromoting_integration_tests.isolate

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « testing/chromoting/browser_tests_launcher.py ('k') | testing/chromoting/integration_tests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/chromoting/chromoting_integration_tests.isolate
diff --git a/testing/chromoting/chromoting_integration_tests.isolate b/testing/chromoting/chromoting_integration_tests.isolate
index cdfd8c4100f5c987dc70e2a1467ee50a89a5f024..88fe16212cfc703e9f10e01e0c847ba217c94b04 100644
--- a/testing/chromoting/chromoting_integration_tests.isolate
+++ b/testing/chromoting/chromoting_integration_tests.isolate
@@ -7,10 +7,16 @@
'variables': {
'command': [
'./browser_tests_launcher.py',
- '-f',
+ '--commands_file',
'./browser_test_commands_linux.txt',
- '-p',
+ '--prod_dir',
'<(PRODUCT_DIR)',
+ '--cfg_file',
+ '../../remoting/tools/internal/test-account-host-config.json',
+ '--manifest_file',
+ '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json',
+ '--user_profile_dir',
+ '/tmp/chromoting_test_profile',
],
'files': [
'../xvfb.py',
@@ -19,6 +25,8 @@
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libosmesa.so',
'<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+ '../../remoting/tools/internal/test-account-host-config.json',
+ '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json',
],
},
}],
@@ -37,7 +45,7 @@
'<(PRODUCT_DIR)/remoting/remoting.webapp/',
'<(PRODUCT_DIR)/remoting/remoting.webapp.v2/',
'<(PRODUCT_DIR)/resources.pak',
- '../../remoting/tools/internal/test_accounts.json',
+ '../../remoting/tools/internal/test_accounts.json',
],
'read_only': 1,
},
@@ -83,5 +91,6 @@
],
'includes': [
'../../base/base.isolate',
+ '../../gin/v8.isolate',
],
-}
+}
« no previous file with comments | « testing/chromoting/browser_tests_launcher.py ('k') | testing/chromoting/integration_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698