diff options
author | William Blevins <wblevins001@gmail.com> | 2016-11-29 01:25:38 (GMT) |
---|---|---|
committer | William Blevins <wblevins001@gmail.com> | 2016-11-29 01:25:38 (GMT) |
commit | 055dc8f39e8b0d175a7acdd5977bb35b152ad170 (patch) | |
tree | ef23a36453bb12cbc8ffdbe0b2f371c2d6b5bb36 /test/YACC | |
parent | daab400692d467faf2af7ac035cc00a15711ce82 (diff) | |
download | SCons-055dc8f39e8b0d175a7acdd5977bb35b152ad170.zip SCons-055dc8f39e8b0d175a7acdd5977bb35b152ad170.tar.gz SCons-055dc8f39e8b0d175a7acdd5977bb35b152ad170.tar.bz2 |
Fixing merge conflict resolution: removed old test files.
Diffstat (limited to 'test/YACC')
-rw-r--r-- | test/YACC/YACCCOM-fixture/.exclude_tests | 1 | ||||
-rw-r--r-- | test/YACC/YACCCOM-fixture/myyacc.py | 7 | ||||
-rw-r--r-- | test/YACC/shared-fixture/.exclude_tests | 1 | ||||
-rw-r--r-- | test/YACC/shared-fixture/aaa.y | 2 | ||||
-rw-r--r-- | test/YACC/shared-fixture/bbb.yacc | 2 |
5 files changed, 0 insertions, 13 deletions
diff --git a/test/YACC/YACCCOM-fixture/.exclude_tests b/test/YACC/YACCCOM-fixture/.exclude_tests deleted file mode 100644 index f12c4d0..0000000 --- a/test/YACC/YACCCOM-fixture/.exclude_tests +++ /dev/null @@ -1 +0,0 @@ -myyacc.py diff --git a/test/YACC/YACCCOM-fixture/myyacc.py b/test/YACC/YACCCOM-fixture/myyacc.py deleted file mode 100644 index 1502800..0000000 --- a/test/YACC/YACCCOM-fixture/myyacc.py +++ /dev/null @@ -1,7 +0,0 @@ -import sys -outfile = open(sys.argv[1], 'wb') -for f in sys.argv[2:]: - infile = open(f, 'rb') - for l in [l for l in infile.readlines() if l != b'/*yacc*/\n']: - outfile.write(l) -sys.exit(0) diff --git a/test/YACC/shared-fixture/.exclude_tests b/test/YACC/shared-fixture/.exclude_tests deleted file mode 100644 index f12c4d0..0000000 --- a/test/YACC/shared-fixture/.exclude_tests +++ /dev/null @@ -1 +0,0 @@ -myyacc.py diff --git a/test/YACC/shared-fixture/aaa.y b/test/YACC/shared-fixture/aaa.y deleted file mode 100644 index f7f4cc7..0000000 --- a/test/YACC/shared-fixture/aaa.y +++ /dev/null @@ -1,2 +0,0 @@ -aaa.y -/*yacc*/ diff --git a/test/YACC/shared-fixture/bbb.yacc b/test/YACC/shared-fixture/bbb.yacc deleted file mode 100644 index b3c856f..0000000 --- a/test/YACC/shared-fixture/bbb.yacc +++ /dev/null @@ -1,2 +0,0 @@ -bbb.yacc -/*yacc*/ |