From 055dc8f39e8b0d175a7acdd5977bb35b152ad170 Mon Sep 17 00:00:00 2001 From: William Blevins Date: Mon, 28 Nov 2016 20:25:38 -0500 Subject: Fixing merge conflict resolution: removed old test files. --- test/CC/shared-fixture/.exclude_tests | 1 - test/CC/shared-fixture/mycc.py | 6 ------ test/CC/shared-fixture/test1.c | 2 -- test/YACC/YACCCOM-fixture/.exclude_tests | 1 - test/YACC/YACCCOM-fixture/myyacc.py | 7 ------- test/YACC/shared-fixture/.exclude_tests | 1 - test/YACC/shared-fixture/aaa.y | 2 -- test/YACC/shared-fixture/bbb.yacc | 2 -- test/ZIP/ZIPCOM-fixture/.exclude_tests | 1 - test/ZIP/ZIPCOM-fixture/myzip.py | 6 ------ test/ZIP/ZIPCOM-fixture/test1.in | 2 -- test/ZIP/ZIPCOMSTR-fixture/.exclude_tests | 1 - test/ZIP/ZIPCOMSTR-fixture/aaa.in | 2 -- test/ZIP/ZIPCOMSTR-fixture/myzip.py | 7 ------- 14 files changed, 41 deletions(-) delete mode 100644 test/CC/shared-fixture/.exclude_tests delete mode 100644 test/CC/shared-fixture/mycc.py delete mode 100644 test/CC/shared-fixture/test1.c delete mode 100644 test/YACC/YACCCOM-fixture/.exclude_tests delete mode 100644 test/YACC/YACCCOM-fixture/myyacc.py delete mode 100644 test/YACC/shared-fixture/.exclude_tests delete mode 100644 test/YACC/shared-fixture/aaa.y delete mode 100644 test/YACC/shared-fixture/bbb.yacc delete mode 100644 test/ZIP/ZIPCOM-fixture/.exclude_tests delete mode 100644 test/ZIP/ZIPCOM-fixture/myzip.py delete mode 100644 test/ZIP/ZIPCOM-fixture/test1.in delete mode 100644 test/ZIP/ZIPCOMSTR-fixture/.exclude_tests delete mode 100644 test/ZIP/ZIPCOMSTR-fixture/aaa.in delete mode 100644 test/ZIP/ZIPCOMSTR-fixture/myzip.py diff --git a/test/CC/shared-fixture/.exclude_tests b/test/CC/shared-fixture/.exclude_tests deleted file mode 100644 index 3f2bc0f..0000000 --- a/test/CC/shared-fixture/.exclude_tests +++ /dev/null @@ -1 +0,0 @@ -mycc.py diff --git a/test/CC/shared-fixture/mycc.py b/test/CC/shared-fixture/mycc.py deleted file mode 100644 index b96c31c..0000000 --- a/test/CC/shared-fixture/mycc.py +++ /dev/null @@ -1,6 +0,0 @@ -import sys -outfile = open(sys.argv[1], 'wb') -infile = open(sys.argv[2], 'rb') -for l in [l for l in infile.readlines() if l[:6] != b'/*cc*/']: - outfile.write(l) -sys.exit(0) diff --git a/test/CC/shared-fixture/test1.c b/test/CC/shared-fixture/test1.c deleted file mode 100644 index 9c281d7..0000000 --- a/test/CC/shared-fixture/test1.c +++ /dev/null @@ -1,2 +0,0 @@ -test1.c -/*cc*/ 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*/ diff --git a/test/ZIP/ZIPCOM-fixture/.exclude_tests b/test/ZIP/ZIPCOM-fixture/.exclude_tests deleted file mode 100644 index dae6f60..0000000 --- a/test/ZIP/ZIPCOM-fixture/.exclude_tests +++ /dev/null @@ -1 +0,0 @@ -myzip.py diff --git a/test/ZIP/ZIPCOM-fixture/myzip.py b/test/ZIP/ZIPCOM-fixture/myzip.py deleted file mode 100644 index adbc6ac..0000000 --- a/test/ZIP/ZIPCOM-fixture/myzip.py +++ /dev/null @@ -1,6 +0,0 @@ -import sys -outfile = open(sys.argv[1], 'wb') -infile = open(sys.argv[2], 'rb') -for l in [l for l in infile.readlines() if l != b'/*zip*/\n']: - outfile.write(l) -sys.exit(0) diff --git a/test/ZIP/ZIPCOM-fixture/test1.in b/test/ZIP/ZIPCOM-fixture/test1.in deleted file mode 100644 index 0546626..0000000 --- a/test/ZIP/ZIPCOM-fixture/test1.in +++ /dev/null @@ -1,2 +0,0 @@ -test1.in -/*zip*/ diff --git a/test/ZIP/ZIPCOMSTR-fixture/.exclude_tests b/test/ZIP/ZIPCOMSTR-fixture/.exclude_tests deleted file mode 100644 index dae6f60..0000000 --- a/test/ZIP/ZIPCOMSTR-fixture/.exclude_tests +++ /dev/null @@ -1 +0,0 @@ -myzip.py diff --git a/test/ZIP/ZIPCOMSTR-fixture/aaa.in b/test/ZIP/ZIPCOMSTR-fixture/aaa.in deleted file mode 100644 index 8474a29..0000000 --- a/test/ZIP/ZIPCOMSTR-fixture/aaa.in +++ /dev/null @@ -1,2 +0,0 @@ -aaa.in -/*zip*/ diff --git a/test/ZIP/ZIPCOMSTR-fixture/myzip.py b/test/ZIP/ZIPCOMSTR-fixture/myzip.py deleted file mode 100644 index f0fcc51..0000000 --- a/test/ZIP/ZIPCOMSTR-fixture/myzip.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'/*zip*/\n']: - outfile.write(l) -sys.exit(0) -- cgit v0.12