diff options
author | William Deegan <bill@baddogconsulting.com> | 2016-11-28 16:55:46 (GMT) |
---|---|---|
committer | William Deegan <bill@baddogconsulting.com> | 2016-11-28 16:55:46 (GMT) |
commit | e5090adbeb669fbbd8c7794d1eccbc363f950891 (patch) | |
tree | 3c44876b9ad77b8c909ffac4536ebc324d5134f4 | |
parent | a36be0b33a054ae22e61851134090c65fa74e0b1 (diff) | |
parent | f66bfed3936cd5fb7fa720cf0430ded4defe669a (diff) | |
download | SCons-e5090adbeb669fbbd8c7794d1eccbc363f950891.zip SCons-e5090adbeb669fbbd8c7794d1eccbc363f950891.tar.gz SCons-e5090adbeb669fbbd8c7794d1eccbc363f950891.tar.bz2 |
merge heads
-rw-r--r-- | test/CC/shared-fixture/.exclude_tests | 1 | ||||
-rw-r--r-- | test/CC/shared-fixture/mycc.py | 6 | ||||
-rw-r--r-- | test/CC/shared-fixture/test1.c | 2 | ||||
-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 | ||||
-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 |
14 files changed, 41 insertions, 0 deletions
diff --git a/test/CC/shared-fixture/.exclude_tests b/test/CC/shared-fixture/.exclude_tests new file mode 100644 index 0000000..3f2bc0f --- /dev/null +++ b/test/CC/shared-fixture/.exclude_tests @@ -0,0 +1 @@ +mycc.py diff --git a/test/CC/shared-fixture/mycc.py b/test/CC/shared-fixture/mycc.py new file mode 100644 index 0000000..b96c31c --- /dev/null +++ b/test/CC/shared-fixture/mycc.py @@ -0,0 +1,6 @@ +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 new file mode 100644 index 0000000..9c281d7 --- /dev/null +++ b/test/CC/shared-fixture/test1.c @@ -0,0 +1,2 @@ +test1.c +/*cc*/ diff --git a/test/YACC/YACCCOM-fixture/.exclude_tests b/test/YACC/YACCCOM-fixture/.exclude_tests new file mode 100644 index 0000000..f12c4d0 --- /dev/null +++ b/test/YACC/YACCCOM-fixture/.exclude_tests @@ -0,0 +1 @@ +myyacc.py diff --git a/test/YACC/YACCCOM-fixture/myyacc.py b/test/YACC/YACCCOM-fixture/myyacc.py new file mode 100644 index 0000000..1502800 --- /dev/null +++ b/test/YACC/YACCCOM-fixture/myyacc.py @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..f12c4d0 --- /dev/null +++ b/test/YACC/shared-fixture/.exclude_tests @@ -0,0 +1 @@ +myyacc.py diff --git a/test/YACC/shared-fixture/aaa.y b/test/YACC/shared-fixture/aaa.y new file mode 100644 index 0000000..f7f4cc7 --- /dev/null +++ b/test/YACC/shared-fixture/aaa.y @@ -0,0 +1,2 @@ +aaa.y +/*yacc*/ diff --git a/test/YACC/shared-fixture/bbb.yacc b/test/YACC/shared-fixture/bbb.yacc new file mode 100644 index 0000000..b3c856f --- /dev/null +++ b/test/YACC/shared-fixture/bbb.yacc @@ -0,0 +1,2 @@ +bbb.yacc +/*yacc*/ diff --git a/test/ZIP/ZIPCOM-fixture/.exclude_tests b/test/ZIP/ZIPCOM-fixture/.exclude_tests new file mode 100644 index 0000000..dae6f60 --- /dev/null +++ b/test/ZIP/ZIPCOM-fixture/.exclude_tests @@ -0,0 +1 @@ +myzip.py diff --git a/test/ZIP/ZIPCOM-fixture/myzip.py b/test/ZIP/ZIPCOM-fixture/myzip.py new file mode 100644 index 0000000..adbc6ac --- /dev/null +++ b/test/ZIP/ZIPCOM-fixture/myzip.py @@ -0,0 +1,6 @@ +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 new file mode 100644 index 0000000..0546626 --- /dev/null +++ b/test/ZIP/ZIPCOM-fixture/test1.in @@ -0,0 +1,2 @@ +test1.in +/*zip*/ diff --git a/test/ZIP/ZIPCOMSTR-fixture/.exclude_tests b/test/ZIP/ZIPCOMSTR-fixture/.exclude_tests new file mode 100644 index 0000000..dae6f60 --- /dev/null +++ b/test/ZIP/ZIPCOMSTR-fixture/.exclude_tests @@ -0,0 +1 @@ +myzip.py diff --git a/test/ZIP/ZIPCOMSTR-fixture/aaa.in b/test/ZIP/ZIPCOMSTR-fixture/aaa.in new file mode 100644 index 0000000..8474a29 --- /dev/null +++ b/test/ZIP/ZIPCOMSTR-fixture/aaa.in @@ -0,0 +1,2 @@ +aaa.in +/*zip*/ diff --git a/test/ZIP/ZIPCOMSTR-fixture/myzip.py b/test/ZIP/ZIPCOMSTR-fixture/myzip.py new file mode 100644 index 0000000..f0fcc51 --- /dev/null +++ b/test/ZIP/ZIPCOMSTR-fixture/myzip.py @@ -0,0 +1,7 @@ +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) |