diff options
Diffstat (limited to 'test/end-to-end/built-in-rules/TARGETS')
| -rw-r--r-- | test/end-to-end/built-in-rules/TARGETS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/end-to-end/built-in-rules/TARGETS b/test/end-to-end/built-in-rules/TARGETS index c645ecf7..4613a0e7 100644 --- a/test/end-to-end/built-in-rules/TARGETS +++ b/test/end-to-end/built-in-rules/TARGETS @@ -11,6 +11,13 @@ , "keep": ["null.json", "empty.json", "custom.json"] , "deps": [["", "tool-under-test"]] } +, "generic_conflict": + { "type": ["@", "rules", "shell/test", "script"] + , "name": ["generic_conflict"] + , "test": ["generic_conflict.sh"] + , "keep": ["log"] + , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]] + } , "filegen_config": { "type": ["@", "rules", "shell/test", "script"] , "name": ["filegen_config"] @@ -41,6 +48,7 @@ , "deps": [ "export_counting" , "filegen_config" + , "generic_conflict" , "generic_out_dirs" , "generic_sh" , "symlink_config" |