diff options
author | William Deegan <bill@baddogconsulting.com> | 2018-05-11 21:44:15 (GMT) |
---|---|---|
committer | William Deegan <bill@baddogconsulting.com> | 2018-05-11 21:44:15 (GMT) |
commit | 5efd04aaed4c9700a606e11733656225c5d933e8 (patch) | |
tree | dd4f055543f3fbcba5db66d0932eb6118304762a /testing | |
parent | f48da72a3156d90bd6d58a840df1be2b013c5e9b (diff) | |
download | SCons-5efd04aaed4c9700a606e11733656225c5d933e8.zip SCons-5efd04aaed4c9700a606e11733656225c5d933e8.tar.gz SCons-5efd04aaed4c9700a606e11733656225c5d933e8.tar.bz2 |
Add wildcards so we'll catch both 32 and 64 bit versions of java on windows.
Diffstat (limited to 'testing')
-rw-r--r-- | testing/framework/TestSCons.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py index d847845..c32e06a 100644 --- a/testing/framework/TestSCons.py +++ b/testing/framework/TestSCons.py @@ -695,7 +695,7 @@ class TestSCons(TestCommon): if version: if sys.platform == 'win32': patterns = [ - 'C:/Program Files/Java/jdk%s*/bin'%version, + 'C:/Program Files*/Java/jdk%s*/bin'%version, ] else: patterns = [ @@ -707,7 +707,7 @@ class TestSCons(TestCommon): else: if sys.platform == 'win32': patterns = [ - 'C:/Program Files/Java/jdk*/bin', + 'C:/Program Files*/Java/jdk*/bin', ] else: patterns = [ |