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/ZIP | |
| 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/ZIP')
| -rw-r--r-- | test/ZIP/ZIPCOM-fixture/.exclude_tests | 1 | ||||
| -rw-r--r-- | test/ZIP/ZIPCOM-fixture/myzip.py | 6 | ||||
| -rw-r--r-- | test/ZIP/ZIPCOM-fixture/test1.in | 2 | ||||
| -rw-r--r-- | test/ZIP/ZIPCOMSTR-fixture/.exclude_tests | 1 | ||||
| -rw-r--r-- | test/ZIP/ZIPCOMSTR-fixture/aaa.in | 2 | ||||
| -rw-r--r-- | test/ZIP/ZIPCOMSTR-fixture/myzip.py | 7 |
6 files changed, 0 insertions, 19 deletions
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) |