summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--test/GetBuildFailures/option-k.py4
-rw-r--r--test/GetBuildFailures/parallel.py4
-rw-r--r--test/GetBuildFailures/serial.py4
-rw-r--r--test/Rpcgen/RPCGEN.py8
-rw-r--r--test/Rpcgen/RPCGENCLIENTFLAGS.py8
-rw-r--r--test/Rpcgen/RPCGENFLAGS.py8
-rw-r--r--test/Rpcgen/RPCGENHEADERFLAGS.py8
-rw-r--r--test/Rpcgen/RPCGENSERVICEFLAGS.py8
-rw-r--r--test/Rpcgen/RPCGENXDRFLAGS.py8
-rw-r--r--test/YACC/YACCHFILESUFFIX.py4
-rw-r--r--test/YACC/YACCHXXFILESUFFIX.py2
-rw-r--r--test/YACC/YACCVCGFILESUFFIX.py2
12 files changed, 34 insertions, 34 deletions
diff --git a/test/GetBuildFailures/option-k.py b/test/GetBuildFailures/option-k.py
index 92a9db8..039ad50 100644
--- a/test/GetBuildFailures/option-k.py
+++ b/test/GetBuildFailures/option-k.py
@@ -45,11 +45,11 @@ test = TestSCons.TestSCons()
contents = r"""\
import sys
-if sys.argv[0] == 'mypass.py':
+if 'mypass.py' in sys.argv[0]:
with open(sys.argv[3], 'wb') as ofp, open(sys.argv[4], 'rb') as ifp:
ofp.write(ifp.read())
exit_value = 0
-elif sys.argv[0] == 'myfail.py':
+elif 'myfail.py' in sys.argv[0]:
exit_value = 1
sys.exit(exit_value)
"""
diff --git a/test/GetBuildFailures/parallel.py b/test/GetBuildFailures/parallel.py
index 5387e4a..63125ad 100644
--- a/test/GetBuildFailures/parallel.py
+++ b/test/GetBuildFailures/parallel.py
@@ -59,11 +59,11 @@ write_marker = sys.argv[2] + '.marker'
if wait_marker != '-.marker':
while not os.path.exists(wait_marker):
time.sleep(1)
-if sys.argv[0] == 'mypass.py':
+if 'mypass.py' in sys.argv[0]:
with open(sys.argv[3], 'wb') as ofp, open(sys.argv[4], 'rb') as ifp:
ofp.write(ifp.read())
exit_value = 0
-elif sys.argv[0] == 'myfail.py':
+elif 'myfail.py' in sys.argv[0]:
exit_value = 1
if write_marker != '-.marker':
os.mkdir(write_marker)
diff --git a/test/GetBuildFailures/serial.py b/test/GetBuildFailures/serial.py
index 7557dd5..4aecc12 100644
--- a/test/GetBuildFailures/serial.py
+++ b/test/GetBuildFailures/serial.py
@@ -48,11 +48,11 @@ test = TestSCons.TestSCons()
contents = r"""\
import sys
-if sys.argv[0] == 'mypass.py':
+if 'mypass.py' in sys.argv[0]:
with open(sys.argv[3], 'wb') as ofp, open(sys.argv[4], 'rb') as ifp:
ofp.write(ifp.read())
exit_value = 0
-elif sys.argv[0] == 'myfail.py':
+elif 'myfail.py' in sys.argv[0]:
exit_value = 1
sys.exit(exit_value)
"""
diff --git a/test/Rpcgen/RPCGEN.py b/test/Rpcgen/RPCGEN.py
index eaa4e16..86cdd71 100644
--- a/test/Rpcgen/RPCGEN.py
+++ b/test/Rpcgen/RPCGEN.py
@@ -69,10 +69,10 @@ expect_h = output % ('-h', test.workpath('rpcif.h'))
expect_svc = output % ('-m', test.workpath('rpcif_svc.c'))
expect_xdr = output % ('-c', test.workpath('rpcif_xdr.c'))
-test.must_match('rpcif_clnt.c', expect_clnt, mode='r')
-test.must_match('rpcif.h', expect_h, mode='r')
-test.must_match('rpcif_svc.c', expect_svc, mode='r')
-test.must_match('rpcif_xdr.c', expect_xdr, mode='r')
+test.must_contain('rpcif_clnt.c', expect_clnt, mode='r')
+test.must_contain('rpcif.h', expect_h, mode='r')
+test.must_contain('rpcif_svc.c', expect_svc, mode='r')
+test.must_contain('rpcif_xdr.c', expect_xdr, mode='r')
diff --git a/test/Rpcgen/RPCGENCLIENTFLAGS.py b/test/Rpcgen/RPCGENCLIENTFLAGS.py
index a298ebd..1143227 100644
--- a/test/Rpcgen/RPCGENCLIENTFLAGS.py
+++ b/test/Rpcgen/RPCGENCLIENTFLAGS.py
@@ -72,10 +72,10 @@ expect_h = output % ('-h', test.workpath('rpcif.h'))
expect_svc = output % ('-m', test.workpath('rpcif_svc.c'))
expect_xdr = output % ('-c', test.workpath('rpcif_xdr.c'))
-test.must_match('rpcif_clnt.c', expect_clnt, mode='r')
-test.must_match('rpcif.h', expect_h, mode='r')
-test.must_match('rpcif_svc.c', expect_svc, mode='r')
-test.must_match('rpcif_xdr.c', expect_xdr, mode='r')
+test.must_contain('rpcif_clnt.c', expect_clnt, mode='r')
+test.must_contain('rpcif.h', expect_h, mode='r')
+test.must_contain('rpcif_svc.c', expect_svc, mode='r')
+test.must_contain('rpcif_xdr.c', expect_xdr, mode='r')
diff --git a/test/Rpcgen/RPCGENFLAGS.py b/test/Rpcgen/RPCGENFLAGS.py
index c254ed0..3673a23 100644
--- a/test/Rpcgen/RPCGENFLAGS.py
+++ b/test/Rpcgen/RPCGENFLAGS.py
@@ -71,10 +71,10 @@ expect_h = output % ('-h', test.workpath('rpcif.h'))
expect_svc = output % ('-m', test.workpath('rpcif_svc.c'))
expect_xdr = output % ('-c', test.workpath('rpcif_xdr.c'))
-test.must_match('rpcif_clnt.c', expect_clnt, mode='r')
-test.must_match('rpcif.h', expect_h, mode='r')
-test.must_match('rpcif_svc.c', expect_svc, mode='r')
-test.must_match('rpcif_xdr.c', expect_xdr, mode='r')
+test.must_contain('rpcif_clnt.c', expect_clnt, mode='r')
+test.must_contain('rpcif.h', expect_h, mode='r')
+test.must_contain('rpcif_svc.c', expect_svc, mode='r')
+test.must_contain('rpcif_xdr.c', expect_xdr, mode='r')
diff --git a/test/Rpcgen/RPCGENHEADERFLAGS.py b/test/Rpcgen/RPCGENHEADERFLAGS.py
index 8e40ad7..6223ba3 100644
--- a/test/Rpcgen/RPCGENHEADERFLAGS.py
+++ b/test/Rpcgen/RPCGENHEADERFLAGS.py
@@ -72,10 +72,10 @@ expect_h = output_h % ('-h', test.workpath('rpcif.h'))
expect_svc = output % ('-m', test.workpath('rpcif_svc.c'))
expect_xdr = output % ('-c', test.workpath('rpcif_xdr.c'))
-test.must_match('rpcif_clnt.c', expect_clnt, mode='r')
-test.must_match('rpcif.h', expect_h, mode='r')
-test.must_match('rpcif_svc.c', expect_svc, mode='r')
-test.must_match('rpcif_xdr.c', expect_xdr, mode='r')
+test.must_contain('rpcif_clnt.c', expect_clnt, mode='r')
+test.must_contain('rpcif.h', expect_h, mode='r')
+test.must_contain('rpcif_svc.c', expect_svc, mode='r')
+test.must_contain('rpcif_xdr.c', expect_xdr, mode='r')
diff --git a/test/Rpcgen/RPCGENSERVICEFLAGS.py b/test/Rpcgen/RPCGENSERVICEFLAGS.py
index 2edc77c..7cdf430 100644
--- a/test/Rpcgen/RPCGENSERVICEFLAGS.py
+++ b/test/Rpcgen/RPCGENSERVICEFLAGS.py
@@ -72,10 +72,10 @@ expect_h = output % ('-h', test.workpath('rpcif.h'))
expect_svc = output_svc % ('-m', test.workpath('rpcif_svc.c'))
expect_xdr = output % ('-c', test.workpath('rpcif_xdr.c'))
-test.must_match('rpcif_clnt.c', expect_clnt, mode='r')
-test.must_match('rpcif.h', expect_h, mode='r')
-test.must_match('rpcif_svc.c', expect_svc, mode='r')
-test.must_match('rpcif_xdr.c', expect_xdr, mode='r')
+test.must_contain('rpcif_clnt.c', expect_clnt, mode='r')
+test.must_contain('rpcif.h', expect_h, mode='r')
+test.must_contain('rpcif_svc.c', expect_svc, mode='r')
+test.must_contain('rpcif_xdr.c', expect_xdr, mode='r')
diff --git a/test/Rpcgen/RPCGENXDRFLAGS.py b/test/Rpcgen/RPCGENXDRFLAGS.py
index 2d1ca96..2f6d8d9 100644
--- a/test/Rpcgen/RPCGENXDRFLAGS.py
+++ b/test/Rpcgen/RPCGENXDRFLAGS.py
@@ -72,10 +72,10 @@ expect_h = output % ('-h', test.workpath('rpcif.h'))
expect_svc = output % ('-m', test.workpath('rpcif_svc.c'))
expect_xdr = output_xdr % ('-c', test.workpath('rpcif_xdr.c'))
-test.must_match('rpcif_clnt.c', expect_clnt, mode='r')
-test.must_match('rpcif.h', expect_h, mode='r')
-test.must_match('rpcif_svc.c', expect_svc, mode='r')
-test.must_match('rpcif_xdr.c', expect_xdr, mode='r')
+test.must_contain('rpcif_clnt.c', expect_clnt, mode='r')
+test.must_contain('rpcif.h', expect_h, mode='r')
+test.must_contain('rpcif_svc.c', expect_svc, mode='r')
+test.must_contain('rpcif_xdr.c', expect_xdr, mode='r')
diff --git a/test/YACC/YACCHFILESUFFIX.py b/test/YACC/YACCHFILESUFFIX.py
index 6c34db1..da3416c 100644
--- a/test/YACC/YACCHFILESUFFIX.py
+++ b/test/YACC/YACCHFILESUFFIX.py
@@ -71,9 +71,9 @@ test.write('bbb.yacc', "bbb.yacc\n/*yacc*/\n")
test.run(arguments = '.')
test.must_match('aaa.c', "aaa.y\n")
-test.must_match('aaa.hsuffix', "myyacc.py -d -o aaa.c aaa.y\n")
+test.must_contain('aaa.hsuffix', "myyacc.py -d -o aaa.c aaa.y\n")
test.must_match('bbb.c', "bbb.yacc\n")
-test.must_match('bbb.hsuffix', "myyacc.py -d -o bbb.c bbb.yacc\n")
+test.must_contain('bbb.hsuffix', "myyacc.py -d -o bbb.c bbb.yacc\n")
test.up_to_date(arguments = '.')
diff --git a/test/YACC/YACCHXXFILESUFFIX.py b/test/YACC/YACCHXXFILESUFFIX.py
index 63a5358..3ee70ee 100644
--- a/test/YACC/YACCHXXFILESUFFIX.py
+++ b/test/YACC/YACCHXXFILESUFFIX.py
@@ -69,7 +69,7 @@ test.write('aaa.yy', "aaa.yy\n/*yacc*/\n")
test.run(arguments = '.')
test.must_match('aaa.cc', "aaa.yy\n")
-test.must_match('aaa.hxxsuffix', "myyacc.py -d -o aaa.cc aaa.yy\n")
+test.must_contain('aaa.hxxsuffix', "myyacc.py -d -o aaa.cc aaa.yy\n")
test.up_to_date(arguments = '.')
diff --git a/test/YACC/YACCVCGFILESUFFIX.py b/test/YACC/YACCVCGFILESUFFIX.py
index aee3265..32c3440 100644
--- a/test/YACC/YACCVCGFILESUFFIX.py
+++ b/test/YACC/YACCVCGFILESUFFIX.py
@@ -78,7 +78,7 @@ test.must_not_exist('aaa.vcgsuffix')
test.must_match('bbb.cc', "bbb.yy\n")
test.must_not_exist('bbb.vcg')
-test.must_match('bbb.vcgsuffix', "myyacc.py -g -o bbb.cc bbb.yy\n")
+test.must_contain('bbb.vcgsuffix', "myyacc.py -g -o bbb.cc bbb.yy\n")
test.up_to_date(arguments = '.')
generated by cgit v0.12 at 2024-12-01 10:12:47 (GMT)