diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-10-02 21:20:00 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2018-10-02 21:20:00 (GMT) |
| commit | 7cae39dc41ee3ff6becb53dbc8c426eddff9b8ac (patch) | |
| tree | 5a95b6c8a035aae298c901829fbc196fd6036d05 /testing | |
| parent | 98dfcef355d8d68360fde70afb52bc4250b1926b (diff) | |
| download | SCons-7cae39dc41ee3ff6becb53dbc8c426eddff9b8ac.zip SCons-7cae39dc41ee3ff6becb53dbc8c426eddff9b8ac.tar.gz SCons-7cae39dc41ee3ff6becb53dbc8c426eddff9b8ac.tar.bz2 | |
Fixes for Java tests on win32
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/framework/TestCmd.py | 3 | ||||
| -rw-r--r-- | testing/framework/TestSCons.py | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/testing/framework/TestCmd.py b/testing/framework/TestCmd.py index 9499ff4..96b8b5d 100644 --- a/testing/framework/TestCmd.py +++ b/testing/framework/TestCmd.py @@ -1612,7 +1612,8 @@ class TestCmd(object): new = os.path.join(self.workdir, sub) try: os.mkdir(new) - except OSError: + except OSError as e: + print("Got error :%s"%e) pass else: count = count + 1 diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py index 5ae6846..feadef9 100644 --- a/testing/framework/TestSCons.py +++ b/testing/framework/TestSCons.py @@ -857,11 +857,15 @@ class TestSCons(TestCommon): fmt = "Could not find javac for Java version %s, skipping test(s).\n" self.skip_test(fmt % version) else: - m = re.search(r'javac (\d\.\d)', self.stderr()) + m = re.search(r'javac (\d\.*\d)', self.stderr()) + # Java 11 outputs this to stdout + if not m: + m = re.search(r'javac (\d\.*\d)', self.stdout()) + if m: version = m.group(1) self.javac_is_gcj = False - elif self.stderr().find('gcj'): + elif self.stderr().find('gcj') != -1: version='1.2' self.javac_is_gcj = True else: |