diff options
55 files changed, 192 insertions, 306 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index d246780..4c232b6 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -1287,7 +1287,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'ash_unittests.isolate', ], 'sources': [ 'ash_unittests.isolate', diff --git a/ash/ash_unittests.isolate b/ash/ash_unittests.isolate index 2f3b8c6..918a8e0 100644 --- a/ash/ash_unittests.isolate +++ b/ash/ash_unittests.isolate @@ -5,7 +5,7 @@ 'conditions': [ ['OS=="win" or chromeos==1', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '../testing/test_env.py', '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/chrome_100_percent.pak', @@ -23,7 +23,7 @@ '<(PRODUCT_DIR)/ash_unittests', '--test-launcher-bot-mode', ], - 'isolate_dependency_tracked': [ + 'files': [ '../testing/xvfb.py', '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libosmesa.so', @@ -32,7 +32,7 @@ }], ['OS=="linux" and use_ozone==0', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, @@ -44,7 +44,7 @@ '<(PRODUCT_DIR)/ash_unittests.exe', '--test-launcher-bot-mode', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/ffmpegsumo.dll', '<(PRODUCT_DIR)/osmesa.dll', ], @@ -52,7 +52,7 @@ }], ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(PRODUCT_DIR)/ash_unittests.exe.pdb', ], }, diff --git a/base/base.gyp b/base/base.gyp index c45ccc7..12de4b1 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -1479,7 +1479,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'base_unittests.isolate', ], 'sources': [ 'base_unittests.isolate', diff --git a/base/base.isolate b/base/base.isolate index 03c45a1..91c0668 100644 --- a/base/base.isolate +++ b/base/base.isolate @@ -11,14 +11,14 @@ 'conditions': [ ['OS=="linux" and asan==1', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/lib/libc++.so', ], }, }], ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Debug"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ # Copy the VS runtime DLLs into the isolate so that they # don't have to be preinstalled on the target machine. '<(PRODUCT_DIR)/msvcp120d.dll', @@ -28,7 +28,7 @@ }], ['OS=="win" and component=="shared_library" and CONFIGURATION_NAME=="Release"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ # Copy the VS runtime DLLs into the isolate so that they # don't have to be preinstalled on the target machine. '<(PRODUCT_DIR)/msvcp120.dll', diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate index a7a0723..c5c192c 100644 --- a/base/base_unittests.isolate +++ b/base/base_unittests.isolate @@ -5,7 +5,7 @@ 'conditions': [ ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ 'test/data/', ], }, @@ -19,21 +19,21 @@ '--brave-new-test-launcher', '--test-launcher-bot-mode', ], - 'isolate_dependency_tracked': [ + 'files': [ '../testing/xvfb.py', ], }, }], ['OS=="linux" and use_ozone==0', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '../testing/test_env.py', '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', ], @@ -52,7 +52,7 @@ }], ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(PRODUCT_DIR)/base_unittests.exe.pdb', ], }, diff --git a/breakpad/breakpad_unittests.isolate b/breakpad/breakpad_unittests.isolate index 6334b39..24c1634 100644 --- a/breakpad/breakpad_unittests.isolate +++ b/breakpad/breakpad_unittests.isolate @@ -5,7 +5,7 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/linux_dumper_unittest_helper', ], }, diff --git a/build/common.gypi b/build/common.gypi index 159d603..ef263ba 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -920,13 +920,9 @@ # dependencies verified. All the tests targets have the '_run' suffix, # e.g. base_unittests_run runs the target base_unittests. The test # target always calls tools/swarming_client/isolate.py. See the script's - # --help for more information and the valid --mode values. Meant to be - # overriden with GYP_DEFINES. + # --help for more information. Meant to be overriden with GYP_DEFINES. # TODO(maruel): Remove the conditions as more configurations are # supported. - # NOTE: The check for disable_nacl==0 and component=="static_library" - # can't be used here because these variables are not defined yet, but it - # is still not supported. ['OS!="ios" and OS!="android" and chromeos==0', { 'test_isolation_mode%': 'check', }, { diff --git a/build/isolate.gypi b/build/isolate.gypi index c02beb9..17bf3c7 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -17,7 +17,6 @@ # ], # 'includes': [ # '../build/isolate.gypi', -# 'foo_test.isolate', # ], # 'sources': [ # 'foo_test.isolate', @@ -50,18 +49,6 @@ '<(DEPTH)/tools/isolate_driver.py', '<(DEPTH)/tools/swarming_client/isolate.py', '<(DEPTH)/tools/swarming_client/run_isolated.py', - - # Disable file tracking by the build driver for now. This means the - # project must have the proper build-time dependency for their runtime - # dependency. This improves the runtime of the build driver since it - # doesn't have to stat() all these files. - # - # More importantly, it means that even if a isolate_dependency_tracked - # file is missing, for example if a file was deleted and the .isolate - # file was not updated, that won't break the build, especially in the - # case where foo_tests_run is not built! This should be reenabled once - # the switch-over to running tests on Swarm is completed. - #'<@(isolate_dependency_tracked)', ], 'outputs': [], 'action': [ diff --git a/cc/cc_perftests.isolate b/cc/cc_perftests.isolate index 0aa38c0..38e5e4f 100644 --- a/cc/cc_perftests.isolate +++ b/cc/cc_perftests.isolate @@ -5,7 +5,7 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ 'test/data/', ], }, diff --git a/chrome/angle.isolate b/chrome/angle.isolate index 4b2d70d..151cd1b 100644 --- a/chrome/angle.isolate +++ b/chrome/angle.isolate @@ -8,7 +8,7 @@ 'conditions': [ ['OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/d3dcompiler_46.dll', '<(PRODUCT_DIR)/libEGL.dll', '<(PRODUCT_DIR)/libGLESv2.dll', diff --git a/chrome/angle_unittests.isolate b/chrome/angle_unittests.isolate index 1689ebc..1cb7b23 100644 --- a/chrome/angle_unittests.isolate +++ b/chrome/angle_unittests.isolate @@ -11,7 +11,7 @@ 'command': [ '<(PRODUCT_DIR)/angle_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/angle_unittests<(EXECUTABLE_SUFFIX)', ], }, diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index cbb092c..ad88dfd 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -12,7 +12,7 @@ '--test-launcher-bot-mode', '--lsan=<(lsan)', ], - 'isolate_dependency_tracked': [ + 'files': [ '../testing/xvfb.py', '<(PRODUCT_DIR)/libclearkeycdm.so', '<(PRODUCT_DIR)/libclearkeycdmadapter.so', @@ -22,55 +22,53 @@ }], ['OS=="linux" and use_ozone==0', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], ['OS=="linux" and libpeer_target_type=="loadable_module"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/lib/libpeerconnection.so', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ - '../media/test/data/', - '../ppapi/tests/test_case.html', - '../ppapi/tests/test_page.css', - '../testing/test_env.py', - '../third_party/accessibility-audit/axs_testing.js', - '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/peerconnection_server<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc.nmf', - '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib.nmf', - '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl.nmf', - '<(PRODUCT_DIR)/test_case.html', - '<(PRODUCT_DIR)/test_case.html.mock-http-headers', - '<(PRODUCT_DIR)/test_page.css', - 'browser/policy/test/asn1der.py', - 'browser/policy/test/policy_testserver.py', - ], - 'isolate_dependency_untracked': [ + 'files': [ '../content/test/data/', '../google_apis/test/', '../media/test/data/', + '../media/test/data/', '../net/data/', '../net/tools/testserver/', + '../ppapi/tests/test_case.html', + '../ppapi/tests/test_page.css', + '../testing/test_env.py', + '../third_party/accessibility-audit/axs_testing.js', '../third_party/pyftpdlib/', '../third_party/pywebsocket/', '../third_party/safe_browsing/', '../third_party/simplejson/', '../third_party/tlslite/', + '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/nacl_test_data/', + '<(PRODUCT_DIR)/peerconnection_server<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/pnacl/', + '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc.nmf', + '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib.nmf', + '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl.nmf', '<(PRODUCT_DIR)/pseudo_locales/', '<(PRODUCT_DIR)/pyproto/', '<(PRODUCT_DIR)/remoting/unittests/', + '<(PRODUCT_DIR)/test_case.html', + '<(PRODUCT_DIR)/test_case.html.mock-http-headers', '<(PRODUCT_DIR)/test_data/', + '<(PRODUCT_DIR)/test_page.css', '<(PRODUCT_DIR)/test_url_loader_data/', + 'browser/policy/test/asn1der.py', + 'browser/policy/test/policy_testserver.py', 'common/extensions/docs/examples/apps/calculator/', 'test/data/', 'third_party/mock4js/', @@ -80,17 +78,15 @@ }], ['OS=="linux" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/mock_nacl_gdb<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_untracked': [ + 'files': [ '../third_party/bidichecker/', + '<(PRODUCT_DIR)/mock_nacl_gdb<(EXECUTABLE_SUFFIX)', ], }, }], ['OS=="win" or (OS=="linux" and target_arch=="x64")', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/lib64/', '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x64.nexe', '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x64.nexe', @@ -100,22 +96,20 @@ }], ['OS=="mac"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/clearkeycdmadapter.plugin', '<(PRODUCT_DIR)/content_shell.pak', '<(PRODUCT_DIR)/libclearkeycdm.dylib', '<(PRODUCT_DIR)/osmesa.so', - '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests', - ], - 'isolate_dependency_untracked': [ '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/', '<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/', + '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests', ], }, }], ['OS=="mac" and target_arch=="ia32"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/lib32/', '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x32.nexe', '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x32.nexe', @@ -134,50 +128,46 @@ }], ['OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '../native_client/build/build_nexe.py', '<(PRODUCT_DIR)/chrome_elf.dll', '<(PRODUCT_DIR)/clearkeycdm.dll', '<(PRODUCT_DIR)/clearkeycdmadapter.dll', + '<(PRODUCT_DIR)/plugins/', '<(PRODUCT_DIR)/ppapi_tests.dll', 'tools/build/repack_locales.py', ], - 'isolate_dependency_untracked': [ - '<(PRODUCT_DIR)/plugins/', - ], }, }], ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(PRODUCT_DIR)/browser_tests.exe.pdb', ], }, }], ['OS=="win" and libpeer_target_type=="loadable_module"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/libpeerconnection.dll', ], }, }], ['chromeos==1', { 'variables': { - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/content_shell.pak', - '<(PRODUCT_DIR)/keyboard_resources.pak', - '<(PRODUCT_DIR)/libexif.so', - '<(PRODUCT_DIR)/nacl_helper', - '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', - 'browser/chromeos/login/test/https_forwarder.py', - ], - 'isolate_dependency_untracked': [ + 'files': [ '../chromeos/test/data/', '../ui/file_manager/file_manager/', '../ui/webui/resources/js/', '<(PRODUCT_DIR)/chromevox_test_data/', + '<(PRODUCT_DIR)/content_shell.pak', + '<(PRODUCT_DIR)/keyboard_resources.pak', + '<(PRODUCT_DIR)/libexif.so', '<(PRODUCT_DIR)/locales/', + '<(PRODUCT_DIR)/nacl_helper', + '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', '<(PRODUCT_DIR)/resources/chromeos/', + 'browser/chromeos/login/test/https_forwarder.py', ], }, }], diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate index 339329e..d13da6d 100644 --- a/chrome/chrome.isolate +++ b/chrome/chrome.isolate @@ -5,7 +5,7 @@ 'conditions': [ ['OS=="linux"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libosmesa.so', '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)', @@ -15,7 +15,7 @@ }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/resources.pak', ], }, @@ -25,27 +25,25 @@ 'command': [ '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/chrome_100_percent.pak', '<(PRODUCT_DIR)/locales/en-US.pak', '<(PRODUCT_DIR)/locales/fr.pak', - ], - 'isolate_dependency_untracked': [ '<(PRODUCT_DIR)/resources/extension/', ], }, }], ['OS=="win" or (OS=="linux" and target_arch=="x64")', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', ], }, }], ['OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/chrome_200_percent.pak', ], }, @@ -55,20 +53,18 @@ 'command': [ '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS/<(mac_product_name)', ], - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/exif.so', - '<(PRODUCT_DIR)/ffmpegsumo.so', - ], - 'isolate_dependency_untracked': [ + 'files': [ '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', '<(PRODUCT_DIR)/<(mac_product_name) Helper.app/', '<(PRODUCT_DIR)/<(mac_product_name).app/', + '<(PRODUCT_DIR)/exif.so', + '<(PRODUCT_DIR)/ffmpegsumo.so', ], }, }], ['OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/<(version_full).manifest', '<(PRODUCT_DIR)/chrome.dll', '<(PRODUCT_DIR)/chrome_elf.dll', @@ -80,14 +76,14 @@ }], ['OS=="win" and target_arch=="ia32"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/nacl64.exe', ], }, }], ['OS=="win" and component=="static_library"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/chrome_child.dll', ], }, diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 93386d4..12b2ee4 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -676,7 +676,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'chrome.isolate', ], 'sources': [ 'chrome.isolate', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index f2cddaf..8787887 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2930,7 +2930,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'browser_tests.isolate', ], 'sources': [ 'browser_tests.isolate', @@ -2958,7 +2957,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'interactive_ui_tests.isolate', ], 'sources': [ 'interactive_ui_tests.isolate', @@ -2979,7 +2977,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'sync_integration_tests.isolate', ], 'sources': [ 'sync_integration_tests.isolate', @@ -3009,9 +3006,6 @@ '../gpu/gpu.gyp:angle_unittests', 'gpu_tests_base', ], - 'includes': [ - 'angle_unittests.isolate', - ], 'sources': [ 'angle_unittests.isolate', ], @@ -3023,9 +3017,6 @@ '../gpu/gpu.gyp:gl_tests', 'gpu_tests_base', ], - 'includes': [ - 'gl_tests.isolate', - ], 'sources': [ 'gl_tests.isolate', ], @@ -3037,9 +3028,6 @@ 'browser_tests_run', 'gpu_tests_base', ], - 'includes': [ - 'tab_capture_end2end_tests.isolate', - ], 'sources': [ 'tab_capture_end2end_tests.isolate', ], @@ -3052,9 +3040,6 @@ '../tools/telemetry/telemetry.gyp:bitmaptools#host', 'gpu_tests_base', ], - 'includes': [ - 'telemetry_gpu_test.isolate', - ], 'sources': [ 'telemetry_gpu_test.isolate', ], @@ -3066,9 +3051,6 @@ '../gpu/gpu.gyp:gpu_unittests', 'gpu_tests_base', ], - 'includes': [ - 'gpu_unittests.isolate', - ], 'sources': [ 'gpu_unittests.isolate', ], @@ -3084,9 +3066,6 @@ '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test', 'gpu_tests_base', ], - 'includes': [ - 'gles2_conform_test.isolate', - ], 'sources': [ 'gles2_conform_test.isolate', ], diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 4e9c994..7567b3c 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -2861,7 +2861,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'unit_tests.isolate', ], 'sources': [ 'unit_tests.isolate', diff --git a/chrome/gl_tests.isolate b/chrome/gl_tests.isolate index 1afc399..112eb72 100644 --- a/chrome/gl_tests.isolate +++ b/chrome/gl_tests.isolate @@ -11,7 +11,7 @@ 'command': [ '<(PRODUCT_DIR)/gl_tests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/gl_tests<(EXECUTABLE_SUFFIX)', ], }, diff --git a/chrome/gles2_conform_test.isolate b/chrome/gles2_conform_test.isolate index 91d86a3..d096770 100644 --- a/chrome/gles2_conform_test.isolate +++ b/chrome/gles2_conform_test.isolate @@ -12,7 +12,7 @@ 'command': [ '<(PRODUCT_DIR)/gles2_conform_test<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/gles2_conform_test<(EXECUTABLE_SUFFIX)', '../gpu/gles2_conform_support/gles2_conform_test_expectations.txt', ], @@ -21,14 +21,12 @@ # .isolate format doesn't support nested conditions. ['(OS=="linux" or OS=="mac" or OS=="win") and internal_gles2_conform_tests==1', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ + '../third_party/gles2_conform/GTF_ES/', '<(PRODUCT_DIR)/gles2_conform_test_windowless<(EXECUTABLE_SUFFIX)', # Could add gles2_conform_test_angle or # gles2_conform_test_chromeos if the bots were testing those. ], - 'isolate_dependency_untracked': [ - '../third_party/gles2_conform/GTF_ES/', - ], }, }], ], diff --git a/chrome/gpu_unittests.isolate b/chrome/gpu_unittests.isolate index 3bdd334..6219888 100644 --- a/chrome/gpu_unittests.isolate +++ b/chrome/gpu_unittests.isolate @@ -11,7 +11,7 @@ 'command': [ '<(PRODUCT_DIR)/gpu_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/gpu_unittests<(EXECUTABLE_SUFFIX)', ], }, diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp index 2fba2e0..c2bb835 100644 --- a/chrome/installer/mini_installer.gyp +++ b/chrome/installer/mini_installer.gyp @@ -294,7 +294,6 @@ ], 'includes': [ '../../build/isolate.gypi', - 'mini_installer_tests.isolate', ], 'sources': [ 'mini_installer_tests.isolate', diff --git a/chrome/installer/mini_installer_tests.isolate b/chrome/installer/mini_installer_tests.isolate index 83aa7ea..480b704 100644 --- a/chrome/installer/mini_installer_tests.isolate +++ b/chrome/installer/mini_installer_tests.isolate @@ -13,11 +13,9 @@ '--target=Release', '--force-clean', ], - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/mini_installer.exe', - ], - 'isolate_dependency_untracked': [ + 'files': [ '../test/mini_installer/', + '<(PRODUCT_DIR)/mini_installer.exe', ], }, }], diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate index 04f6cc2..645d83c 100644 --- a/chrome/interactive_ui_tests.isolate +++ b/chrome/interactive_ui_tests.isolate @@ -12,36 +12,32 @@ '--test-launcher-bot-mode', '--lsan=<(lsan)', ], - 'isolate_dependency_tracked': [ + 'files': [ '../testing/xvfb.py', '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libosmesa.so', - ], - 'isolate_dependency_untracked': [ '<(PRODUCT_DIR)/pyproto/', ], }, }], ['OS=="linux" and use_ozone==0', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/resources.pak', - ], - 'isolate_dependency_untracked': [ + 'files': [ '../net/data/ssl/certificates/', '../net/tools/testserver/', + '../testing/test_env.py', '../third_party/pyftpdlib/', '../third_party/pywebsocket/', '../third_party/tlslite/', + '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)', + '<(PRODUCT_DIR)/resources.pak', 'test/data/', ], 'read_only': 1, @@ -49,7 +45,7 @@ }], ['OS=="linux" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/chrome_100_percent.pak', '<(PRODUCT_DIR)/locales/en-US.pak', '<(PRODUCT_DIR)/locales/fr.pak', @@ -59,13 +55,11 @@ }], ['OS=="mac"', { 'variables': { - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/ffmpegsumo.so', - '<(PRODUCT_DIR)/osmesa.so', - ], - 'isolate_dependency_untracked': [ + 'files': [ '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', '<(PRODUCT_DIR)/<(mac_product_name).app/', + '<(PRODUCT_DIR)/ffmpegsumo.so', + '<(PRODUCT_DIR)/osmesa.so', ], }, }], @@ -80,36 +74,32 @@ }], ['OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/chrome_elf.dll', '<(PRODUCT_DIR)/d3dcompiler_46.dll', '<(PRODUCT_DIR)/ffmpegsumo.dll', '<(PRODUCT_DIR)/libEGL.dll', '<(PRODUCT_DIR)/libGLESv2.dll', '<(PRODUCT_DIR)/osmesa.dll', - ], - 'isolate_dependency_untracked': [ '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll', ], }, }], ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(PRODUCT_DIR)/interactive_ui_tests.exe.pdb', ], }, }], ['chromeos==1', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ + '../google_apis/test/', '<(PRODUCT_DIR)/keyboard_resources.pak', '<(PRODUCT_DIR)/libexif.so', '<(PRODUCT_DIR)/nacl_helper', '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', - ], - 'isolate_dependency_untracked': [ - '../google_apis/test/', '<(PRODUCT_DIR)/resources/chromeos/', ], }, diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate index 7901d5b..03b0e59 100644 --- a/chrome/sync_integration_tests.isolate +++ b/chrome/sync_integration_tests.isolate @@ -11,7 +11,7 @@ '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', '--test-launcher-bot-mode', ], - 'isolate_dependency_tracked': [ + 'files': [ '../testing/test_env.py', '../testing/xvfb.py', '<(PRODUCT_DIR)/libffmpegsumo.so', @@ -21,14 +21,14 @@ }], ['OS=="linux" and use_ozone==0', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], ['OS=="linux" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/chrome_100_percent.pak', '<(PRODUCT_DIR)/locales/en-US.pak', ], @@ -36,18 +36,16 @@ }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/resources.pak', - '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_untracked': [ + 'files': [ '../chrome/test/data/sync/', '../net/tools/testserver/', '../sync/tools/testserver/', - '../third_party/tlslite/', '../third_party/pyftpdlib/', '../third_party/pywebsocket/', + '../third_party/tlslite/', '<(PRODUCT_DIR)/pyproto/', + '<(PRODUCT_DIR)/resources.pak', + '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', ], }, }], @@ -61,18 +59,16 @@ }], ['OS=="mac"', { 'variables': { - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/ffmpegsumo.so', - ], - 'isolate_dependency_untracked': [ + 'files': [ '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', '<(PRODUCT_DIR)/<(mac_product_name).app/', + '<(PRODUCT_DIR)/ffmpegsumo.so', ], }, }], ['OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/chrome_elf.dll', '<(PRODUCT_DIR)/ffmpegsumo.dll', ], @@ -80,14 +76,14 @@ }], ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(PRODUCT_DIR)/sync_integration_tests.exe.pdb', ], }, }], ['chromeos==1', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/libexif.so', ], }, diff --git a/chrome/tab_capture_end2end_tests.isolate b/chrome/tab_capture_end2end_tests.isolate index 1a3e9fe..5f686e0 100644 --- a/chrome/tab_capture_end2end_tests.isolate +++ b/chrome/tab_capture_end2end_tests.isolate @@ -16,7 +16,7 @@ '--test-launcher-jobs=1', '--gtest_filter=TabCaptureApiPixelTest.EndToEnd*', ], - 'isolate_dependency_untracked': [ + 'files': [ 'test/data/extensions/api_test/tab_capture/', ], }, diff --git a/chrome/telemetry.isolate b/chrome/telemetry.isolate index 05a00a9..0fb220b 100644 --- a/chrome/telemetry.isolate +++ b/chrome/telemetry.isolate @@ -19,20 +19,18 @@ # Note that the dependency on ../build/android/ was made more # precise to ../build/android/pylib/. 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ + '../build/android/pylib/', + '../build/util/', '../third_party/WebKit/PerformanceTests/resources/jquery.tablesorter.min.js', '../third_party/WebKit/PerformanceTests/resources/statistics.js', + '../third_party/android_testrunner/', '../third_party/flot/jquery.flot.min.js', - '../tools/perf/unit-info.json', - '<(PRODUCT_DIR)/bitmaptools<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_untracked': [ - '../build/android/pylib/', - '../build/util/', + '../third_party/webpagereplay/', '../tools/crx_id/', + '../tools/perf/unit-info.json', '../tools/telemetry/', - '../third_party/android_testrunner/', - '../third_party/webpagereplay/', + '<(PRODUCT_DIR)/bitmaptools<(EXECUTABLE_SUFFIX)', ], }, }], diff --git a/chrome/telemetry_gpu_test.isolate b/chrome/telemetry_gpu_test.isolate index 84f262c..a82dc0d 100644 --- a/chrome/telemetry_gpu_test.isolate +++ b/chrome/telemetry_gpu_test.isolate @@ -11,7 +11,7 @@ # conformance tests, to be run. However, extra command line arguments # must be supplied in order to run any one of them. 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '../content/test/gpu/', '../content/test/data/gpu/', # For GpuProcess.video @@ -28,14 +28,14 @@ # an assertion fires or a crash occurs. Add more as necessary. ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/chrome.exe.pdb', ], }, }], ['OS=="win" and component=="shared_library" and (fastbuild==0 or fastbuild==1)', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/base.dll.pdb', '<(PRODUCT_DIR)/blink_platform.dll.pdb', '<(PRODUCT_DIR)/blink_web.dll.pdb', diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate index a69b4a3..483a9f6 100644 --- a/chrome/unit_tests.isolate +++ b/chrome/unit_tests.isolate @@ -5,25 +5,23 @@ 'conditions': [ ['OS=="android" or OS=="linux"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(PRODUCT_DIR)/test_data/', ], }, }], ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ - '../third_party/accessibility-audit/axs_testing.js', - '../tools/metrics/histograms/histograms.xml', - '<(PRODUCT_DIR)/resources.pak', - ], - 'isolate_dependency_untracked': [ + 'files': [ '../base/test/data/', '../components/test/data/', '../extensions/test/data/', '../net/data/', + '../third_party/accessibility-audit/axs_testing.js', '../third_party/hunspell_dictionaries/', '../third_party/zlib/google/test/data/', + '../tools/metrics/histograms/histograms.xml', + '<(PRODUCT_DIR)/resources.pak', 'test/data/', 'third_party/mock4js/', ], @@ -31,7 +29,7 @@ }], ['OS=="android" or OS=="linux" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/chrome_100_percent.pak', '<(PRODUCT_DIR)/locales/en-US.pak', ], @@ -46,7 +44,7 @@ '--brave-new-test-launcher', '--test-launcher-bot-mode', ], - 'isolate_dependency_tracked': [ + 'files': [ '../testing/xvfb.py', '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libosmesa.so', @@ -56,24 +54,22 @@ }], ['OS=="linux" and use_ozone==0', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ - '../testing/test_env.py', - '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_untracked': [ + 'files': [ '../net/tools/testserver/', + '../testing/test_env.py', '../third_party/pyftpdlib/', '../third_party/pywebsocket/', '../third_party/tlslite/', '<(PRODUCT_DIR)/pyproto/', '<(PRODUCT_DIR)/test_data/', + '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)', ], }, }], @@ -85,14 +81,12 @@ }], ['OS=="mac"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ + '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', '<(PRODUCT_DIR)/exif.so', '<(PRODUCT_DIR)/ffmpegsumo.so', '<(PRODUCT_DIR)/osmesa.so', ], - 'isolate_dependency_untracked': [ - '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', - ], }, }], ['OS=="mac" or OS=="win"', { @@ -107,7 +101,10 @@ }], ['OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ + '../ppapi/lib/gl/include/KHR/', + '../skia/ext/data/', + '../ui/base/glib/', '<(PRODUCT_DIR)/blacklist_test_dll_1.dll', '<(PRODUCT_DIR)/chrome_elf.dll', '<(PRODUCT_DIR)/ffmpegsumo.dll', @@ -117,27 +114,20 @@ '<(PRODUCT_DIR)/verifier_test_dll_2.dll', 'test/data/safe_browsing/signed_binary.dll', ], - 'isolate_dependency_untracked': [ - '../ppapi/lib/gl/include/KHR/', - '../skia/ext/data/', - '../ui/base/glib/', - ], }, }], ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(PRODUCT_DIR)/unit_tests.exe.pdb', ], }, }], ['chromeos==1', { 'variables': { - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/libexif.so', - ], - 'isolate_dependency_untracked': [ + 'files': [ '../chromeos/test/data/network/', + '<(PRODUCT_DIR)/libexif.so', ], }, }], diff --git a/components/components_unittests.isolate b/components/components_unittests.isolate index 7bd0b71..4d83010 100644 --- a/components/components_unittests.isolate +++ b/components/components_unittests.isolate @@ -5,13 +5,11 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/chrome_100_percent.pak', '<(PRODUCT_DIR)/content_resources.pak', '<(PRODUCT_DIR)/locales/en-US.pak', '<(PRODUCT_DIR)/resources.pak', - ], - 'isolate_dependency_untracked': [ 'test/data/', ], }, diff --git a/components/nacl.gyp b/components/nacl.gyp index 3d3c301..1cab4f0 100644 --- a/components/nacl.gyp +++ b/components/nacl.gyp @@ -463,7 +463,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'nacl_loader_unittests.isolate', ], 'sources': [ 'nacl_loader_unittests.isolate', diff --git a/components/nacl_loader_unittests.isolate b/components/nacl_loader_unittests.isolate index c4632b0..bdb01e0 100644 --- a/components/nacl_loader_unittests.isolate +++ b/components/nacl_loader_unittests.isolate @@ -8,7 +8,7 @@ 'command': [ '<(PRODUCT_DIR)/nacl_loader_unittests', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/nacl_loader_unittests', ], 'read_only': 1, diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate index e794b2f..1c45e86 100644 --- a/content/content_browsertests.isolate +++ b/content/content_browsertests.isolate @@ -5,28 +5,28 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak', ], }, }], ['chromeos==1', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/content_shell.pak', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/content_shell.pak', ], }, }], ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '../media/test/data/', '../net/data/', 'test/data/', @@ -42,7 +42,7 @@ '--test-launcher-bot-mode', '--lsan=<(lsan)', ], - 'isolate_dependency_tracked': [ + 'files': [ '../testing/xvfb.py', '<(PRODUCT_DIR)/content_shell.pak', '<(PRODUCT_DIR)/libffmpegsumo.so', @@ -53,37 +53,33 @@ }], ['OS=="linux" and use_ozone==0', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ + '../net/tools/testserver/', '../ppapi/tests/test_case.html', '../ppapi/tests/test_page.css', '../testing/test_env.py', - '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_untracked': [ - '../net/tools/testserver/', '../third_party/pyftpdlib/', '../third_party/pywebsocket/', '../third_party/tlslite/', + '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', ], }, }], ['OS=="mac"', { 'variables': { - 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/ffmpegsumo.so', - '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests', - ], - 'isolate_dependency_untracked': [ + 'files': [ '<(PRODUCT_DIR)/Content Shell.app/', + '<(PRODUCT_DIR)/ffmpegsumo.so', '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/', '<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/', + '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests', ], }, }], @@ -98,7 +94,7 @@ }], ['OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/content_shell.pak', '<(PRODUCT_DIR)/ffmpegsumo.dll', '<(PRODUCT_DIR)/osmesa.dll', @@ -110,7 +106,7 @@ }], ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(PRODUCT_DIR)/content_browsertests.exe.pdb', ], }, diff --git a/content/content_gl_tests.isolate b/content/content_gl_tests.isolate index 106dfb7..d5ff6d7 100644 --- a/content/content_gl_tests.isolate +++ b/content/content_gl_tests.isolate @@ -8,7 +8,7 @@ 'command': [ '<(PRODUCT_DIR)/content_gl_tests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/content_gl_tests<(EXECUTABLE_SUFFIX)', ], }, @@ -18,7 +18,7 @@ # errors. Should investigate further. ['OS=="linux" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/content_resources.pak', '<(PRODUCT_DIR)/ui_test.pak', ], @@ -26,21 +26,21 @@ }], ['OS=="linux"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/libffmpegsumo.so', ], }, }], ['OS=="mac"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/ffmpegsumo.so', ], }, }], ['OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/d3dcompiler_46.dll', '<(PRODUCT_DIR)/libEGL.dll', '<(PRODUCT_DIR)/libGLESv2.dll', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index f8d4b65..bd85b66 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -974,7 +974,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'content_browsertests.isolate', ], 'sources': [ 'content_browsertests.isolate', @@ -988,7 +987,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'content_unittests.isolate', ], 'sources': [ 'content_unittests.isolate', @@ -1013,7 +1011,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'content_gl_tests.isolate', ], 'sources': [ 'content_gl_tests.isolate', diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate index 7f4f9c4..5747c2f 100644 --- a/content/content_unittests.isolate +++ b/content/content_unittests.isolate @@ -5,7 +5,7 @@ 'conditions': [ ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '../media/test/data/', 'test/data/', ], @@ -13,21 +13,21 @@ }], ['OS=="android"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/content_shell.pak', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '../testing/test_env.py', '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', ], @@ -42,7 +42,7 @@ '--brave-new-test-launcher', '--test-launcher-bot-mode', ], - 'isolate_dependency_tracked': [ + 'files': [ '../testing/xvfb.py', '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libosmesa.so', @@ -51,7 +51,7 @@ }], ['OS=="linux" and use_ozone==0', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, @@ -64,7 +64,7 @@ '--brave-new-test-launcher', '--test-launcher-bot-mode', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/ffmpegsumo.so', '<(PRODUCT_DIR)/osmesa.so', ], @@ -78,7 +78,7 @@ '--brave-new-test-launcher', '--test-launcher-bot-mode', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/ffmpegsumo.dll', '<(PRODUCT_DIR)/osmesa.dll', ], @@ -86,7 +86,7 @@ }], ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(PRODUCT_DIR)/content_unittests.exe.pdb', ], }, diff --git a/media/media.gyp b/media/media.gyp index a76e4e7..0539cc4 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -1954,7 +1954,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'media_unittests.isolate', ], 'sources': [ 'media_unittests.isolate', diff --git a/media/media_perftests.isolate b/media/media_perftests.isolate index 0aa38c0..38e5e4f 100644 --- a/media/media_perftests.isolate +++ b/media/media_perftests.isolate @@ -5,7 +5,7 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ 'test/data/', ], }, diff --git a/media/media_unittests.isolate b/media/media_unittests.isolate index 92ebec1..3a17689 100644 --- a/media/media_unittests.isolate +++ b/media/media_unittests.isolate @@ -8,7 +8,7 @@ 'conditions': [ ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ 'test/data/', ], }, @@ -18,7 +18,7 @@ 'command': [ '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)', ], }, @@ -26,21 +26,21 @@ # TODO(jmadill): should be automatic. http://crbug.com/418146 ['OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/ffmpegsumo.dll', ], }, }], ['OS=="mac"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/ffmpegsumo.so', ], }, }], ['OS=="linux"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/libffmpegsumo.so', ], }, diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp index 45144c5..bca8aa6 100644 --- a/mojo/mojo.gyp +++ b/mojo/mojo.gyp @@ -683,7 +683,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'mojo_python_unittests.isolate', ], 'sources': [ 'mojo_python_unittests.isolate', diff --git a/mojo/mojo_apps.gypi b/mojo/mojo_apps.gypi index 9bb57ea..631a5e9 100644 --- a/mojo/mojo_apps.gypi +++ b/mojo/mojo_apps.gypi @@ -110,7 +110,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'mojo_apps_js_unittests.isolate', ], 'sources': [ 'mojo_apps_js_unittests.isolate', diff --git a/mojo/mojo_apps_js_unittests.isolate b/mojo/mojo_apps_js_unittests.isolate index d0813a2..6921a46 100644 --- a/mojo/mojo_apps_js_unittests.isolate +++ b/mojo/mojo_apps_js_unittests.isolate @@ -14,13 +14,11 @@ '--brave-new-test-launcher', '--test-launcher-bot-mode', ], - 'isolate_dependency_tracked': [ + 'files': [ '../gin/test/expect.js', '../testing/test_env.py', - '<(PRODUCT_DIR)/mojo_apps_js_unittests<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_untracked': [ '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/', + '<(PRODUCT_DIR)/mojo_apps_js_unittests<(EXECUTABLE_SUFFIX)', 'apps/js/', 'bindings/js/', 'public/js/bindings/', @@ -29,21 +27,21 @@ }], ['OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/mojo_test_support.dll', ], }, }], ['OS=="linux"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/lib/libmojo_test_support.so', ], }, }], ['OS=="mac"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/libmojo_test_support.dylib', ], }, diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp index 9f1127a..03d7948 100644 --- a/mojo/mojo_base.gyp +++ b/mojo/mojo_base.gyp @@ -649,7 +649,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'mojo_js_unittests.isolate', ], 'sources': [ 'mojo_js_unittests.isolate', diff --git a/mojo/mojo_js_unittests.isolate b/mojo/mojo_js_unittests.isolate index 5df0cbd..2b3131b 100644 --- a/mojo/mojo_js_unittests.isolate +++ b/mojo/mojo_js_unittests.isolate @@ -14,13 +14,11 @@ '--brave-new-test-launcher', '--test-launcher-bot-mode', ], - 'isolate_dependency_tracked': [ + 'files': [ '../gin/test/expect.js', '../testing/test_env.py', - '<(PRODUCT_DIR)/mojo_js_unittests<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_untracked': [ '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/', + '<(PRODUCT_DIR)/mojo_js_unittests<(EXECUTABLE_SUFFIX)', 'bindings/js/', 'public/js/bindings/', ], @@ -28,21 +26,21 @@ }], ['OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/mojo_test_support.dll', ], }, }], ['OS=="linux"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/lib/libmojo_test_support.so', ], }, }], ['OS=="mac"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/libmojo_test_support.dylib', ], }, diff --git a/mojo/mojo_python_unittests.isolate b/mojo/mojo_python_unittests.isolate index 62189c1..4fea84a 100644 --- a/mojo/mojo_python_unittests.isolate +++ b/mojo/mojo_python_unittests.isolate @@ -9,14 +9,12 @@ 'tools/run_mojo_python_bindings_tests.py', '--build-dir=<(PRODUCT_DIR)', ], - 'isolate_dependency_tracked': [ - 'tools/pylib/mojo_python_tests_runner.py', - 'tools/run_mojo_python_bindings_tests.py', - ], - 'isolate_dependency_untracked': [ - 'python/tests/', + 'files': [ '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/', '<(PRODUCT_DIR)/python/', + 'python/tests/', + 'tools/pylib/mojo_python_tests_runner.py', + 'tools/run_mojo_python_bindings_tests.py', ], }, }], diff --git a/net/net.gyp b/net/net.gyp index 2ea8b99..e570e8e 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1681,7 +1681,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'net_unittests.isolate', ], 'sources': [ 'net_unittests.isolate', diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate index 53e2674..dafa0d7 100644 --- a/net/net_unittests.isolate +++ b/net/net_unittests.isolate @@ -5,7 +5,7 @@ 'conditions': [ ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ 'data/', ], }, @@ -18,14 +18,12 @@ '--brave-new-test-launcher', '--test-launcher-bot-mode', ], - 'isolate_dependency_tracked': [ + 'files': [ '../testing/test_env.py', - '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_untracked': [ '../third_party/pyftpdlib/', '../third_party/pywebsocket/', '../third_party/tlslite/', + '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/pyproto/', 'tools/testserver/', ], @@ -34,7 +32,7 @@ }], ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ '<(PRODUCT_DIR)/net_unittests.exe.pdb', ], }, diff --git a/sandbox/linux/sandbox_linux.gypi b/sandbox/linux/sandbox_linux.gypi index adcfd3f..24ce3cf 100644 --- a/sandbox/linux/sandbox_linux.gypi +++ b/sandbox/linux/sandbox_linux.gypi @@ -339,7 +339,6 @@ ], 'includes': [ '../../build/isolate.gypi', - '../sandbox_linux_unittests.isolate', ], 'sources': [ '../sandbox_linux_unittests.isolate', diff --git a/sandbox/sandbox_linux_unittests.isolate b/sandbox/sandbox_linux_unittests.isolate index 8986566..2dadddd 100644 --- a/sandbox/sandbox_linux_unittests.isolate +++ b/sandbox/sandbox_linux_unittests.isolate @@ -12,7 +12,7 @@ 'command': [ '<(PRODUCT_DIR)/sandbox_linux_unittests', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/sandbox_linux_unittests', ], 'read_only': 1, diff --git a/sql/sql.gyp b/sql/sql.gyp index 975cd12..5926836 100644 --- a/sql/sql.gyp +++ b/sql/sql.gyp @@ -146,7 +146,6 @@ ], 'includes': [ '../build/isolate.gypi', - 'sql_unittests.isolate', ], 'sources': [ 'sql_unittests.isolate', diff --git a/sql/sql_unittests.isolate b/sql/sql_unittests.isolate index 75e776d..f422ae6 100644 --- a/sql/sql_unittests.isolate +++ b/sql/sql_unittests.isolate @@ -5,7 +5,7 @@ 'conditions': [ ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_untracked': [ + 'files': [ 'test/data/', ], }, diff --git a/testing/chromoting/chromoting_integration_tests.isolate b/testing/chromoting/chromoting_integration_tests.isolate index 59afdd5..4b45213 100644 --- a/testing/chromoting/chromoting_integration_tests.isolate +++ b/testing/chromoting/chromoting_integration_tests.isolate @@ -15,7 +15,7 @@ '--webapp-unpacked=<(PRODUCT_DIR)/remoting/remoting.webapp', '--extension-name=Chromoting', ], - 'isolate_dependency_tracked': [ + 'files': [ '../xvfb.py', '<(PRODUCT_DIR)/libffmpegsumo.so', '<(PRODUCT_DIR)/libosmesa.so', @@ -25,14 +25,14 @@ }], ['OS=="linux" and use_ozone==0', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, }], ['OS=="linux" or OS=="mac" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '../test_env.py', '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/remoting/remoting.webapp/', @@ -43,7 +43,7 @@ }], ['OS=="linux" or OS=="win"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/chrome_100_percent.pak', '<(PRODUCT_DIR)/locales/en-US.pak', ], diff --git a/testing/chromoting/integration_tests.gyp b/testing/chromoting/integration_tests.gyp index 2652b5d..b6c801d 100644 --- a/testing/chromoting/integration_tests.gyp +++ b/testing/chromoting/integration_tests.gyp @@ -15,7 +15,6 @@ ], 'includes': [ '../../build/isolate.gypi', - 'chromoting_integration_tests.isolate', ], 'sources': [ 'chromoting_integration_tests.isolate', diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp index a92b39a..acb733c 100644 --- a/third_party/cacheinvalidation/cacheinvalidation.gyp +++ b/third_party/cacheinvalidation/cacheinvalidation.gyp @@ -182,7 +182,6 @@ ], 'includes': [ '../../build/isolate.gypi', - 'cacheinvalidation_unittests.isolate', ], 'sources': [ 'cacheinvalidation_unittests.isolate', diff --git a/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate b/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate index f802a45..df306da 100644 --- a/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate +++ b/third_party/cacheinvalidation/cacheinvalidation_unittests.isolate @@ -9,7 +9,7 @@ '<(PRODUCT_DIR)/cacheinvalidation_unittests<(EXECUTABLE_SUFFIX)', '--test-launcher-bot-mode', ], - 'isolate_dependency_tracked': [ + 'files': [ '<(PRODUCT_DIR)/cacheinvalidation_unittests<(EXECUTABLE_SUFFIX)', ], }, diff --git a/tools/isolate_driver.py b/tools/isolate_driver.py index 23dcead..af9907f 100755 --- a/tools/isolate_driver.py +++ b/tools/isolate_driver.py @@ -237,7 +237,7 @@ def create_wrapper(args, isolate_index, isolated_index): ], 'variables': { # Will look like ['<(PRODUCT_DIR)/lib/flibuser_prefs.so']. - isolate_format.KEY_TRACKED: sorted( + 'files': sorted( '<(PRODUCT_DIR)/%s' % i.replace(os.path.sep, '/') for i in binary_deps), }, diff --git a/ui/base/ui_base_tests.isolate b/ui/base/ui_base_tests.isolate index 3e393a8..eced8ae 100644 --- a/ui/base/ui_base_tests.isolate +++ b/ui/base/ui_base_tests.isolate @@ -5,7 +5,7 @@ 'conditions': [ ['OS=="android"', { 'variables': { - 'isolate_dependency_tracked': [ + 'files': [ 'test/data/data_pack_unittest/truncated-header.pak', '<(PRODUCT_DIR)/locales/en-US.pak', ], |