diff options
| author | Mats Wichmann <mats@linux.com> | 2019-11-06 15:37:49 (GMT) |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2019-11-06 15:37:49 (GMT) |
| commit | e2e147378027376f42043f798e47d93353237fec (patch) | |
| tree | c2d21769f1aa89da47016b792c271e602b835e73 /test/YACC | |
| parent | c6ca3bdd2ad8e9a6ceea398934d84def9ba7c497 (diff) | |
| download | SCons-e2e147378027376f42043f798e47d93353237fec.zip SCons-e2e147378027376f42043f798e47d93353237fec.tar.gz SCons-e2e147378027376f42043f798e47d93353237fec.tar.bz2 | |
[3.9] change tests not to expect bare scriptname
Python 3.9 changes to give an absolute path in sys.argv[0].
Some tests expected to see just a simple path ('myyacc.py');
these now either do a test.must_contain instead of must_match,
or change to do "if 'mypass.py' in sys.argv[0]' instead of
the former "if sys.argv[0] == 'mypass.py'".
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'test/YACC')
| -rw-r--r-- | test/YACC/YACCHFILESUFFIX.py | 4 | ||||
| -rw-r--r-- | test/YACC/YACCHXXFILESUFFIX.py | 2 | ||||
| -rw-r--r-- | test/YACC/YACCVCGFILESUFFIX.py | 2 |
3 files changed, 4 insertions, 4 deletions
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 = '.') |