diff options
| author | William Deegan <bill@baddogconsulting.com> | 2019-03-03 17:56:55 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2019-03-03 17:56:55 (GMT) |
| commit | 9fe21847c4c987792326d515a851b673d96af930 (patch) | |
| tree | fdc5e663d02fddac3a55209fbc970265d9c1d150 /test/Decider | |
| parent | a6849f5629cbcc5a1c8693f398b9641cbc92208f (diff) | |
| download | SCons-9fe21847c4c987792326d515a851b673d96af930.zip SCons-9fe21847c4c987792326d515a851b673d96af930.tar.gz SCons-9fe21847c4c987792326d515a851b673d96af930.tar.bz2 | |
Fix logic in test to only use --wincompat if win_flex. Improve test skip messaging
Diffstat (limited to 'test/Decider')
| -rw-r--r-- | test/Decider/MD5-winonly-firstbuild.py | 4 | ||||
| -rw-r--r-- | test/Decider/MD5-winonly-fixture/SConstruct | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/test/Decider/MD5-winonly-firstbuild.py b/test/Decider/MD5-winonly-firstbuild.py index 1e1b51e..87f7999 100644 --- a/test/Decider/MD5-winonly-firstbuild.py +++ b/test/Decider/MD5-winonly-firstbuild.py @@ -43,9 +43,9 @@ if IS_WINDOWS: lex = test.where_is('flex') or test.where_is('lex') or test.where_is('win_flex') # print("Lex:%s yacc:%s"%(lex,yacc)) if not yacc or not lex: - test.skip_test("On windows but no flex/lex/win_flex and yacc/bison/win_bison required for test") + test.skip_test("On windows but no flex/lex/win_flex and yacc/bison/win_bison required for test\n") else: - test.skip_test("Windows only test") + test.skip_test("Windows only test\n") test.dir_fixture('MD5-winonly-fixture') diff --git a/test/Decider/MD5-winonly-fixture/SConstruct b/test/Decider/MD5-winonly-fixture/SConstruct index c194c47..9775a43 100644 --- a/test/Decider/MD5-winonly-fixture/SConstruct +++ b/test/Decider/MD5-winonly-fixture/SConstruct @@ -5,5 +5,6 @@ env.AppendENVPath('PATH', r'd:\mesa\flexbison') env.Tool('lex') env.Tool('yacc') env['YACCFLAGS'] = '-d' -env.Append(LEXFLAGS = ['--wincompat']) +if env['YACC'] == 'win_flex': + env.Append(LEXFLAGS = ['--wincompat']) env.SharedLibrary('dummy',['test_lex.l','test_parse.y']) |