summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Abd-El-Malek <jam@chromium.org>2014-09-19 11:57:42 -0700
committerJohn Abd-El-Malek <jam@chromium.org>2014-09-19 18:58:34 +0000
commit59e489093730a82ab3cf08bfb8ece9ac5a5ce292 (patch)
treeecd89e9f45dfb0e612d93ff912501632996cd19d
parented01b8549fd0a91de7d64015e120a09a30bb8987 (diff)
downloadchromium_src-59e489093730a82ab3cf08bfb8ece9ac5a5ce292.zip
chromium_src-59e489093730a82ab3cf08bfb8ece9ac5a5ce292.tar.gz
chromium_src-59e489093730a82ab3cf08bfb8ece9ac5a5ce292.tar.bz2
Only add pdb to isolate when fastbuild!=2.
BUG=414808 R=scottmg@chromium.org TBR=ben@chromium.org Review URL: https://codereview.chromium.org/589633002 Cr-Commit-Position: refs/heads/master@{#295754}
-rw-r--r--base/base_unittests.isolate4
-rw-r--r--chrome/browser_tests.isolate8
-rw-r--r--chrome/interactive_ui_tests.isolate8
-rw-r--r--chrome/sync_integration_tests.isolate4
-rw-r--r--chrome/unit_tests.isolate6
-rw-r--r--content/content_browsertests.isolate4
-rw-r--r--content/content_unittests.isolate4
-rw-r--r--net/net_unittests.isolate2
8 files changed, 34 insertions, 6 deletions
diff --git a/base/base_unittests.isolate b/base/base_unittests.isolate
index bd10d01..61b2b04 100644
--- a/base/base_unittests.isolate
+++ b/base/base_unittests.isolate
@@ -44,10 +44,8 @@
],
},
}],
- ['OS=="win"', {
+ ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
'variables': {
- 'isolate_dependency_tracked': [
- ],
'isolate_dependency_untracked': [
'<(PRODUCT_DIR)/base_unittests.exe.pdb',
],
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index 20b3826..e64dddc 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -133,11 +133,17 @@
'tools/build/repack_locales.py',
],
'isolate_dependency_untracked': [
- '<(PRODUCT_DIR)/browser_tests.exe.pdb',
'<(PRODUCT_DIR)/plugins/',
],
},
}],
+ ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
+ 'variables': {
+ 'isolate_dependency_untracked': [
+ '<(PRODUCT_DIR)/browser_tests.exe.pdb',
+ ],
+ },
+ }],
['OS=="win" and libpeer_target_type=="loadable_module"', {
'variables': {
'isolate_dependency_tracked': [
diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
index 8c60db5..b5595bf 100644
--- a/chrome/interactive_ui_tests.isolate
+++ b/chrome/interactive_ui_tests.isolate
@@ -82,11 +82,17 @@
'<(PRODUCT_DIR)/osmesa.dll',
],
'isolate_dependency_untracked': [
- '<(PRODUCT_DIR)/interactive_ui_tests.exe.pdb',
'<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
],
},
}],
+ ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
+ 'variables': {
+ 'isolate_dependency_untracked': [
+ '<(PRODUCT_DIR)/interactive_ui_tests.exe.pdb',
+ ],
+ },
+ }],
['chromeos==1', {
'variables': {
'isolate_dependency_tracked': [
diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
index e7d7f5b..23be3e7 100644
--- a/chrome/sync_integration_tests.isolate
+++ b/chrome/sync_integration_tests.isolate
@@ -70,6 +70,10 @@
'<(PRODUCT_DIR)/chrome_elf.dll',
'<(PRODUCT_DIR)/ffmpegsumo.dll',
],
+ },
+ }],
+ ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
+ 'variables': {
'isolate_dependency_untracked': [
'<(PRODUCT_DIR)/sync_integration_tests.exe.pdb',
],
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index cf7cda4..3f6d27d 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -115,6 +115,12 @@
'../ppapi/lib/gl/include/KHR/',
'../skia/ext/data/',
'../ui/base/glib/',
+ ],
+ },
+ }],
+ ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
+ 'variables': {
+ 'isolate_dependency_untracked': [
'<(PRODUCT_DIR)/unit_tests.exe.pdb',
],
},
diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate
index abf151f..285c2c1 100644
--- a/content/content_browsertests.isolate
+++ b/content/content_browsertests.isolate
@@ -99,6 +99,10 @@
'<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
'<(PRODUCT_DIR)/ppapi_tests.dll',
],
+ },
+ }],
+ ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
+ 'variables': {
'isolate_dependency_untracked': [
'<(PRODUCT_DIR)/content_browsertests.exe.pdb',
],
diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate
index 1303b98..e689a67 100644
--- a/content/content_unittests.isolate
+++ b/content/content_unittests.isolate
@@ -76,6 +76,10 @@
'<(PRODUCT_DIR)/ffmpegsumo.dll',
'<(PRODUCT_DIR)/osmesa.dll',
],
+ },
+ }],
+ ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
+ 'variables': {
'isolate_dependency_untracked': [
'<(PRODUCT_DIR)/content_unittests.exe.pdb',
],
diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate
index d30ad3e..53e2674 100644
--- a/net/net_unittests.isolate
+++ b/net/net_unittests.isolate
@@ -32,7 +32,7 @@
'read_only': 1,
},
}],
- ['OS=="win"', {
+ ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
'variables': {
'isolate_dependency_untracked': [
'<(PRODUCT_DIR)/net_unittests.exe.pdb',