Commit 2b65d0cd authored by maruel@chromium.org's avatar maruel@chromium.org

Add interactive_ui_tests_run.

Add the required target and the .isolate file covering most test cases on linux, mac and windows.

R=csharp@chromium.org
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194412 0039d316-1c4b-4281-b951-d872f2087c98
parent 44d628f6
......@@ -822,6 +822,7 @@
'dependencies': [
'../base/base.gyp:base_unittests_run',
'../chrome/chrome.gyp:browser_tests_run',
'../chrome/chrome.gyp:interactive_ui_tests_run',
'../chrome/chrome.gyp:sync_integration_tests_run',
'../chrome/chrome.gyp:unit_tests_run',
'../net/net.gyp:net_unittests_run',
......
......@@ -3245,6 +3245,27 @@
'browser_tests.isolate',
],
},
{
'target_name': 'interactive_ui_tests_run',
'type': 'none',
'dependencies': [
'interactive_ui_tests',
],
'conditions': [
['use_x11 == 1', {
'dependencies': [
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
}],
],
'includes': [
'../build/isolate.gypi',
'interactive_ui_tests.isolate',
],
'sources': [
'interactive_ui_tests.isolate',
],
},
{
'target_name': 'sync_integration_tests_run',
'type': 'none',
......
# Copyright 2013 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.
{
'conditions': [
['OS=="linux"', {
'variables': {
'command': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)',
'../tools/swarm_client/run_test_cases.py',
'-j1',
'<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)/chrome.pak',
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/locales/fr.pak',
'<(PRODUCT_DIR)/pyproto/google/__init__.py',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'isolate_dependency_tracked': [
'../net/data/ssl/certificates/ok_cert.pem',
'../net/data/ssl/certificates/root_ca_cert.crt',
'../net/tools/testserver/asn1.py',
'../net/tools/testserver/echo_message.py',
'../net/tools/testserver/minica.py',
'../net/tools/testserver/testserver.py',
'../net/tools/testserver/testserver_base.py',
'../testing/test_env.py',
'../third_party/pyftpdlib/src/pyftpdlib/ftpserver.py',
'../tools/swarm_client/run_isolated.py',
'../tools/swarm_client/run_test_cases.py',
'../tools/swarm_client/third_party/upload.py',
'<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/resources.pak',
],
'isolate_dependency_untracked': [
'../third_party/pywebsocket/src/mod_pywebsocket/',
'../third_party/tlslite/tlslite/',
'test/data/',
],
'isolate_dependency_touched': [
'../third_party/pyftpdlib/src/pyftpdlib/__init__.py',
'../tools/swarm_client/third_party/__init__.py',
],
},
}],
['OS=="linux" or OS=="win"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/chrome_100_percent.pak',
],
},
}],
['OS=="mac"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/ffmpegsumo.so',
],
'isolate_dependency_untracked': [
'<(PRODUCT_DIR)/Chromium Framework.framework/',
'<(PRODUCT_DIR)/Chromium.app/',
],
},
}],
['OS=="mac" or OS=="win"', {
'variables': {
'command': [
'../testing/test_env.py',
'../tools/swarm_client/run_test_cases.py',
'-j1',
'<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="win"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/d3dcompiler_46.dll',
'<(PRODUCT_DIR)/ffmpegsumo.dll',
'<(PRODUCT_DIR)/icudt.dll',
'<(PRODUCT_DIR)/libEGL.dll',
'<(PRODUCT_DIR)/libGLESv2.dll',
'<(PRODUCT_DIR)/locales/en-US.pak',
'<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
],
'isolate_dependency_untracked': [
'../third_party/python_26/',
],
},
}],
],
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment