diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-10-01 00:20:50 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2018-10-01 00:20:50 (GMT) |
| commit | b257b48fe5c7006efca86e323836f6b73cb5c359 (patch) | |
| tree | 1916ed6ffbb892f0a4489ff11c43ab62899e2b5d /test/Java | |
| parent | 6c916c5723add8bd00f891d1bad165b79696400a (diff) | |
| download | SCons-b257b48fe5c7006efca86e323836f6b73cb5c359.zip SCons-b257b48fe5c7006efca86e323836f6b73cb5c359.tar.gz SCons-b257b48fe5c7006efca86e323836f6b73cb5c359.tar.bz2 | |
Add test for 1.8. Modularize java tests and move files to a fixture. Change TestCommon's options_arguments to keep passed lists and not join them into a string.
Diffstat (limited to 'test/Java')
| -rw-r--r-- | test/Java/Java-1.6.py | 4 | ||||
| -rw-r--r-- | test/Java/Java-1.8.py | 6 | ||||
| -rw-r--r-- | test/Java/java_version_image/SConstruct | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/test/Java/Java-1.6.py b/test/Java/Java-1.6.py index f1ca14c..15534b0 100644 --- a/test/Java/Java-1.6.py +++ b/test/Java/Java-1.6.py @@ -43,6 +43,8 @@ javac_path=os.path.dirname(where_javac) test.verbose_set(1) +if ' ' in javac_path: + javac_path ='"%s"'%javac_path java_arguments=["--javac_path=%s"%javac_path,"--java_version=%s"%version] test.run(arguments = ['.']+java_arguments) @@ -125,7 +127,7 @@ test.up_to_date(options=["--debug=explain"]+java_arguments, arguments = '.') test.run(arguments = ['.']+java_arguments) - +\ classes_must_not_exist('class1', expect_1) classes_must_not_exist('class2', expect_2) classes_must_not_exist('class3', expect_3) diff --git a/test/Java/Java-1.8.py b/test/Java/Java-1.8.py index a56c1b0..4ac85ca 100644 --- a/test/Java/Java-1.8.py +++ b/test/Java/Java-1.8.py @@ -24,7 +24,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" """ -Test Java compilation with a live Java 1.6 "javac" compiler. +Test Java compilation with a live Java 1.8 "javac" compiler. """ import os @@ -43,6 +43,8 @@ javac_path=os.path.dirname(where_javac) test.verbose_set(1) +if ' ' in javac_path: + javac_path ='"%s"'%javac_path java_arguments=["--javac_path=%s"%javac_path,"--java_version=%s"%version] test.run(arguments = ['.']+java_arguments) @@ -125,7 +127,7 @@ test.up_to_date(options=["--debug=explain"]+java_arguments, arguments = '.') test.run(arguments = ['.']+java_arguments) - +\ classes_must_not_exist('class1', expect_1) classes_must_not_exist('class2', expect_2) classes_must_not_exist('class3', expect_3) diff --git a/test/Java/java_version_image/SConstruct b/test/Java/java_version_image/SConstruct index 6e3b11b..945c864 100644 --- a/test/Java/java_version_image/SConstruct +++ b/test/Java/java_version_image/SConstruct @@ -12,6 +12,8 @@ AddOption('--java_version', type='string') path=GetOption('javac_path') +if path[0] == "'": + path = path[1:-1] version = GetOption('java_version') |