diff options
Diffstat (limited to 'test/SWIG')
| -rw-r--r-- | test/SWIG/SWIGOUTDIR.py | 7 | ||||
| -rw-r--r-- | test/SWIG/build-dir.py | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/test/SWIG/SWIGOUTDIR.py b/test/SWIG/SWIGOUTDIR.py index b638a3b..e0f3f25 100644 --- a/test/SWIG/SWIGOUTDIR.py +++ b/test/SWIG/SWIGOUTDIR.py @@ -42,10 +42,15 @@ swig = test.where_is('swig') if not swig: test.skip_test('Can not find installed "swig", skipping test.\n') +where_java_include=test.java_where_includes() +if not where_java_include: + test.skip_test('Can not find installed Java include files, skipping test.\n') test.write(['SConstruct'], """\ -env = Environment(tools = ['default', 'swig']) +env = Environment(tools = ['default', 'swig'], + CPPPATH=%(where_java_include)s, + ) Java_foo_interface = env.SharedLibrary( 'Java_foo_interface', diff --git a/test/SWIG/build-dir.py b/test/SWIG/build-dir.py index 58ad0cd..8f122af 100644 --- a/test/SWIG/build-dir.py +++ b/test/SWIG/build-dir.py @@ -25,7 +25,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" """ -Make sure SWIG works when a BuildDir (or build_dir) is used. +Make sure SWIG works when a VariantDir (or variant_dir) is used. Test case courtesy Joe Maruszewski. """ @@ -82,7 +82,7 @@ Export("env") # # Build the libraries. # -SConscript("source/SConscript", build_dir = "build") +SConscript("source/SConscript", variant_dir = "build") """ % locals()) test.write(['source', 'SConscript'], """\ |