diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-02 21:16:10 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-02 21:16:10 +0000 |
| commit | 32cb0dff228821b69d5d05135c07c41a267cfbe8 (patch) | |
| tree | 38faad69e717e40ebd32bcad5c01e29dd4013a06 /build/copy_test_data_ios.gypi | |
| parent | 5f85e5401a227622d2d6e14b6431e0edfb9333a7 (diff) | |
| download | chromium_src-32cb0dff228821b69d5d05135c07c41a267cfbe8.zip chromium_src-32cb0dff228821b69d5d05135c07c41a267cfbe8.tar.gz chromium_src-32cb0dff228821b69d5d05135c07c41a267cfbe8.tar.bz2 | |
Fix test data copying on iOS
gyp can cache and re-use the output of scripts that have the same
invocation, and all the test data copying uses "test/data". This is
a relative path, so it's not really the same command, causing flaky
compile failures.
This works around the bug by artificially introducing variation into
the invocation string.
NOTRY=true
BUG=369533
Review URL: https://codereview.chromium.org/265043003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267919 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/copy_test_data_ios.gypi')
| -rw-r--r-- | build/copy_test_data_ios.gypi | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build/copy_test_data_ios.gypi b/build/copy_test_data_ios.gypi index 56a222f..576a0f2 100644 --- a/build/copy_test_data_ios.gypi +++ b/build/copy_test_data_ios.gypi @@ -34,7 +34,12 @@ { 'inputs': [ - '<!@pymod_do_main(copy_test_data_ios --inputs <(test_data_files))', + # The |-o <(test_data_prefix)| is ignored; it is there to work around a + # caching bug in gyp (https://code.google.com/p/gyp/issues/detail?id=112). + # It caches command output when the string is the same, so if two copy + # steps have the same relative paths, there can be bogus cache hits that + # cause compile failures unless something varies. + '<!@pymod_do_main(copy_test_data_ios -o <(test_data_prefix) --inputs <(test_data_files))', ], 'outputs': [ '<!@pymod_do_main(copy_test_data_ios -o <(PRODUCT_DIR)/<(_target_name).app/<(test_data_prefix) --outputs <(test_data_files))', |