Index: test/actions/gyptest-all.py |
diff --git a/test/actions/gyptest-all.py b/test/actions/gyptest-all.py |
index 6061502a1b13b6fcc129d36e304f80f689ac3a70..438687cef9ba8e5d1e582261c6200125ed06a247 100644 |
--- a/test/actions/gyptest-all.py |
+++ b/test/actions/gyptest-all.py |
@@ -18,22 +18,27 @@ test.run_gyp('actions.gyp', chdir='src') |
test.relocate('src', 'relocate/src') |
-# Test that an "always run" action increases a counter on multiple invocations, |
-# and that a dependent action updates in step. |
-test.build('actions.gyp', test.ALL, chdir='relocate/src') |
-test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '1') |
-test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '1') |
-test.build('actions.gyp', test.ALL, chdir='relocate/src') |
-test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '2') |
-test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2') |
- |
-# The "always run" action only counts to 2, but the dependent target will count |
-# forever if it's allowed to run. This verifies that the dependent target only |
-# runs when the "always run" action generates new output, not just because the |
-# "always run" ran. |
-test.build('actions.gyp', test.ALL, chdir='relocate/src') |
-test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '2') |
-test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2') |
+# Some gyp files use an action that mentions an output but never writes it |
+# as a means to making something run on every build. That makes some pretty |
Nico
2011/08/19 18:21:25
Remove 2nd sentence.
Evan Martin
2011/08/19 18:37:13
Hm, do you not like the wording, or what it is say
Nico
2011/08/19 22:45:10
It didn't add any signal to the comment for me, ju
|
+# far-reaching assumptions about how build systems work and doesn't work with |
+# ninja. TODO(evan): figure out how to work always-run actions in to ninja. |
+if test.format != 'ninja': |
+ # Test that an "always run" action increases a counter on multiple invocations, |
+ # and that a dependent action updates in step. |
+ test.build('actions.gyp', test.ALL, chdir='relocate/src') |
+ test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '1') |
+ test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '1') |
+ test.build('actions.gyp', test.ALL, chdir='relocate/src') |
+ test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '2') |
+ test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2') |
+ |
+ # The "always run" action only counts to 2, but the dependent target will count |
+ # forever if it's allowed to run. This verifies that the dependent target only |
+ # runs when the "always run" action generates new output, not just because the |
+ # "always run" ran. |
+ test.build('actions.gyp', test.ALL, chdir='relocate/src') |
+ test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '2') |
+ test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2') |
expect = """\ |
Hello from program.c |