Index: test/analyzer/gyptest-analyzer-deprecated.py |
diff --git a/test/analyzer/gyptest-analyzer.py b/test/analyzer/gyptest-analyzer-deprecated.py |
similarity index 84% |
copy from test/analyzer/gyptest-analyzer.py |
copy to test/analyzer/gyptest-analyzer-deprecated.py |
index 7d1c5285f354c485c9dd56acb26073851b8872e7..42a8a864273e5e52468d9f915bb4f9873c764e79 100644 |
--- a/test/analyzer/gyptest-analyzer.py |
+++ b/test/analyzer/gyptest-analyzer-deprecated.py |
@@ -164,7 +164,7 @@ test.run_gyp('test.gyp', '-Gconfig_path=bogus_file', |
EnsureError('Unable to open file bogus_file') |
# Verify 'invalid_targets' is present when bad target is specified. |
-_CreateConfigFile(['exe2.c'], ['bad_target', 'all', 'exe2']) |
+_CreateConfigFile(['exe2.c'], ['bad_target', 'allx', 'exe2']) |
run_analyzer() |
EnsureInvalidTargets({'bad_target'}) |
@@ -174,109 +174,109 @@ run_analyzer() |
EnsureError('Unable to parse config file test_file') |
# Trivial test of a source. |
-_CreateConfigFile(['foo.c'], ['all', 'exe2']) |
+_CreateConfigFile(['foo.c'], ['allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=True, build_targets={'exe'}) |
# Conditional source that is excluded. |
-_CreateConfigFile(['conditional_source.c'], ['all', 'exe2']) |
+_CreateConfigFile(['conditional_source.c'], ['allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=False) |
# Conditional source that is included by way of argument. |
-_CreateConfigFile(['conditional_source.c'], ['all', 'exe2']) |
+_CreateConfigFile(['conditional_source.c'], ['allx', 'exe2']) |
run_analyzer('-Dtest_variable=1') |
EnsureContains(matched=True, build_targets={'exe'}) |
# Two unknown files. |
-_CreateConfigFile(['unknown1.c', 'unoknow2.cc'], ['all', 'exe2']) |
+_CreateConfigFile(['unknown1.c', 'unoknow2.cc'], ['allx', 'exe2']) |
run_analyzer() |
EnsureContains() |
# Two unknown files. |
-_CreateConfigFile(['unknown1.c', 'subdir/subdir_sourcex.c'], ['all', 'exe2']) |
+_CreateConfigFile(['unknown1.c', 'subdir/subdir_sourcex.c'], ['allx', 'exe2']) |
run_analyzer() |
EnsureContains() |
# Included dependency |
-_CreateConfigFile(['unknown1.c', 'subdir/subdir_source.c'], ['all', 'exe2']) |
+_CreateConfigFile(['unknown1.c', 'subdir/subdir_source.c'], ['allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=True, build_targets={'exe', 'exe3'}) |
# Included inputs to actions. |
-_CreateConfigFile(['action_input.c'], ['all', 'exe2']) |
+_CreateConfigFile(['action_input.c'], ['allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=True, build_targets={'exe'}) |
# Don't consider outputs. |
-_CreateConfigFile(['action_output.c'], ['all', 'exe2']) |
+_CreateConfigFile(['action_output.c'], ['allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=False) |
# Rule inputs. |
-_CreateConfigFile(['rule_input.c'], ['all', 'exe2']) |
+_CreateConfigFile(['rule_input.c'], ['allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=True, build_targets={'exe'}) |
# Ignore path specified with PRODUCT_DIR. |
-_CreateConfigFile(['product_dir_input.c'], ['all', 'exe2']) |
+_CreateConfigFile(['product_dir_input.c'], ['allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=False) |
# Path specified via a variable. |
-_CreateConfigFile(['subdir/subdir_source2.c'], ['all', 'exe2']) |
+_CreateConfigFile(['subdir/subdir_source2.c'], ['allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=True, build_targets={'exe'}) |
# Verifies paths with // are fixed up correctly. |
-_CreateConfigFile(['parent_source.c'], ['all', 'exe2']) |
+_CreateConfigFile(['parent_source.c'], ['allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=True, build_targets={'exe', 'exe3'}) |
# Verifies relative paths are resolved correctly. |
-_CreateConfigFile(['subdir/subdir_source.h'], ['all', 'exe2']) |
+_CreateConfigFile(['subdir/subdir_source.h'], ['allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=True, build_targets={'exe'}) |
# Verifies relative paths in inputs are resolved correctly. |
-_CreateConfigFile(['rel_path1.h'], ['all', 'exe2']) |
+_CreateConfigFile(['rel_path1.h'], ['allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=True, build_targets={'exe'}) |
# Various permutations when passing in targets. |
_CreateConfigFile(['exe2.c', 'subdir/subdir2b_source.c'], |
- ['exe', 'exe3', 'all', 'exe2']) |
+ ['exe', 'exe3', 'allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=True, build_targets={'exe2', 'exe3'}) |
_CreateConfigFile(['exe2.c', 'subdir/subdir2b_source.c'], |
- ['exe', 'all', 'exe2']) |
+ ['exe', 'allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=True, build_targets={'exe2', 'exe3'}) |
# Verifies duplicates are ignored. |
_CreateConfigFile(['exe2.c', 'subdir/subdir2b_source.c'], |
- ['exe', 'exe', 'all', 'exe2']) |
+ ['exe', 'exe', 'allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=True, build_targets={'exe2', 'exe3'}) |
-_CreateConfigFile(['exe2.c'], ['exe', 'all', 'exe2']) |
+_CreateConfigFile(['exe2.c'], ['exe', 'allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=True, build_targets={'exe2'}) |
-_CreateConfigFile(['exe2.c'], ['all', 'exe2']) |
+_CreateConfigFile(['exe2.c'], ['allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=True, build_targets={'exe2'}) |
-_CreateConfigFile(['subdir/subdir2b_source.c', 'exe2.c'], ['all', 'exe2']) |
+_CreateConfigFile(['subdir/subdir2b_source.c', 'exe2.c'], ['allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=True, build_targets={'exe2', 'exe3'}) |
-_CreateConfigFile(['subdir/subdir2b_source.c'], ['exe3', 'all', 'exe2']) |
+_CreateConfigFile(['subdir/subdir2b_source.c'], ['exe3', 'allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=True, build_targets={'exe3'}) |
-_CreateConfigFile(['foo.c'], ['all', 'exe2']) |
+_CreateConfigFile(['foo.c'], ['allx', 'exe2']) |
run_analyzer() |
EnsureContains(matched=True, build_targets={'exe'}) |
@@ -305,51 +305,51 @@ run_analyzer2('-Icommon.gypi') |
EnsureMatchedAll({'exe', 'exe2', 'foo', 'exe3'}) |
# Assertions from test3.gyp. |
-_CreateConfigFile(['d.c', 'f.c'], ['a', 'all']) |
+_CreateConfigFile(['d.c', 'f.c'], ['a', 'allx']) |
run_analyzer3() |
EnsureContains(matched=True, build_targets={'a', 'b'}) |
-_CreateConfigFile(['f.c'], ['a', 'all']) |
+_CreateConfigFile(['f.c'], ['a', 'allx']) |
run_analyzer3() |
EnsureContains(matched=True, build_targets={'a', 'b'}) |
-_CreateConfigFile(['f.c'], ['all']) |
+_CreateConfigFile(['f.c'], ['allx']) |
run_analyzer3() |
EnsureContains(matched=True, build_targets={'a', 'b'}) |
-_CreateConfigFile(['c.c', 'e.c'], ['all']) |
+_CreateConfigFile(['c.c', 'e.c'], ['allx']) |
run_analyzer3() |
EnsureContains(matched=True, build_targets={'a', 'b', 'c', 'e'}) |
-_CreateConfigFile(['d.c'], ['a', 'all']) |
+_CreateConfigFile(['d.c'], ['a', 'allx']) |
run_analyzer3() |
EnsureContains(matched=True, build_targets={'a', 'b'}) |
-_CreateConfigFile(['a.c'], ['a', 'b', 'all']) |
+_CreateConfigFile(['a.c'], ['a', 'b', 'allx']) |
run_analyzer3() |
EnsureContains(matched=True, build_targets={'a'}) |
-_CreateConfigFile(['a.c'], ['a', 'b', 'all']) |
+_CreateConfigFile(['a.c'], ['a', 'b', 'allx']) |
run_analyzer3() |
EnsureContains(matched=True, build_targets={'a'}) |
-_CreateConfigFile(['d.c'], ['a', 'b', 'all']) |
+_CreateConfigFile(['d.c'], ['a', 'b', 'allx']) |
run_analyzer3() |
EnsureContains(matched=True, build_targets={'a', 'b'}) |
-_CreateConfigFile(['f.c'], ['a', 'all']) |
+_CreateConfigFile(['f.c'], ['a', 'allx']) |
run_analyzer3() |
EnsureContains(matched=True, build_targets={'a', 'b'}) |
-_CreateConfigFile(['a.c'], ['a', 'all']) |
+_CreateConfigFile(['a.c'], ['a', 'allx']) |
run_analyzer3() |
EnsureContains(matched=True, build_targets={'a'}) |
-_CreateConfigFile(['a.c'], ['all']) |
+_CreateConfigFile(['a.c'], ['allx']) |
run_analyzer3() |
EnsureContains(matched=True, build_targets={'a'}) |
-_CreateConfigFile(['d.c'], ['all']) |
+_CreateConfigFile(['d.c'], ['allx']) |
run_analyzer3() |
EnsureContains(matched=True, build_targets={'a', 'b'}) |