diff options
author | marvingreenberg <public.marvin@gmail.com> | 2013-01-11 17:40:18 -0500 |
---|---|---|
committer | William S Fulton <wsf@fultondesigns.co.uk> | 2013-01-17 08:13:04 +0000 |
commit | 30b1eafd96f50174ab20159f2a233d5f1758fc39 (patch) | |
tree | a6fe507dcb70246d422512d6d72b28cf546e4b7e /Examples/test-suite | |
parent | 9855e4d0644845474f78385c59fdbafeaab4476e (diff) | |
download | swig-30b1eafd96f50174ab20159f2a233d5f1758fc39.tar.gz |
fix variable names and makefile logic to correctly set PKGDIRSETUP and SWIGOPT for different cases
Diffstat (limited to 'Examples/test-suite')
-rw-r--r-- | Examples/test-suite/java/Makefile.in | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index a69c65ff6..11d7fd3ef 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -15,14 +15,9 @@ C_TEST_CASES = \ java_lib_arrays \ java_lib_various -# Use a different JAVA_PACKAGE set internally in the testcase. This must match -# what is internally in the test .i files (does swig support multiple package levels?) -# Make sure that the pragma dir DOES NOT exist (since test should create) -PRAGMATEST_PACKAGE = pragmajavapackage -PRAGMATEST_DIRSETUP = rm -rf $(PACKAGE_DIR) - CPP_TEST_CASES_PKGPRAGMA = \ - java_test_of_package_pragma + internal_pkgpragma_test + CPP_TEST_CASES_PKGOPT = \ enum_thorough_proper \ @@ -50,15 +45,21 @@ include $(srcdir)/../common.mk # Overridden variables here JAVA_PACKAGE = $* -PKGDIRSETUP = [ -d "$(JAVA_PACKAGE) ] || mkdir -p $(JAVA_PACKAGE); + +ALL_PKGOPT := $(filter-out $(CPP_TEST_CASES_PKGPRAGMA:=.cpptest),$(NOT_BROKEN_TEST_CASES)) +ALL_PKGPRAGMA := $(filter $(CPP_TEST_CASES_PKGPRAGMA:=.cpptest),$(NOT_BROKEN_TEST_CASES)) # Add '-package' swigopt for ALL tests except for CPP_TEST_CASES_PKGPRAGMA -TEST_CASES_WITH_PKGOPT := $(filterout $(CPP_TEST_CASES_PKGPRAGMA:=.cpptest),$(NOT_BROKEN_TEST_CASES)) -$(TEST_CASES_WITH_PKGOPT): SWIGOPT += -package $(JAVA_PACKAGE) +# PKGDIRSETUP should leave 0 exitcode when successful +$(ALL_PKGOPT): SWIGOPT += -package $(JAVA_PACKAGE) +$(ALL_PKGOPT): PKGDIRSETUP = [ -d "$(JAVA_PACKAGE)" ] || mkdir -p "$(JAVA_PACKAGE)" && cd "$(JAVA_PACKAGE)" -# Set JAVA_PACKAGE differently for the one test using a pragma javapackage -$(CPP_TEST_CASES_PKGPRAGMA:=.cpptest): JAVA_PACKAGE=$(PKGPRAGMA_PACKAGE) -$(CPP_TEST_CASES_PKGPRAGMA:=.cpptest): PKGDIRSETUP=$(PKGPRAGMA_DIRSETUP) +# Set JAVA_PACKAGE differently for the tests using internally coded pragma javapackage +# (and must match what is in the test .i file) +# Make sure that the pragma dir DOES NOT exist (since test should create) +# This may not find all the generated java to compile... +$(ALL_PKGPRAGMA): JAVA_PACKAGE = MyExplicitPragmaJavaPackage +$(ALL_PKGPRAGMA): PKGDIRSETUP = rm -rf $(JAVA_PACKAGE) # Custom tests - tests with additional commandline options nspace.%: JAVA_PACKAGE = $*Package @@ -67,23 +68,20 @@ director_nspace.%: JAVA_PACKAGE = $*Package director_nspace_director_name_collision.%: JAVA_PACKAGE = $*Package # Rules for the different types of tests -%.cpptest: +%.cpptest: $(setup) - $(PKGDIRSETUP) - +echo $@ (cd $(JAVA_PACKAGE) && $(swig_and_compile_cpp)) - $echo $@ (run_testcase) + +echo "$@ ($(PKGDIRSETUP) && $(swig_and_compile_cpp))" + echo "$@ $(run_testcase)" %.ctest: $(setup) - $(PKGDIRSETUP) - +echo $@ (cd $(JAVA_PACKAGE) && $(swig_and_compile_c)) - $echo $@ (run_testcase) + +echo "$@ ($(PKGDIRSETUP) && $(swig_and_compile_c))" + echo "$@ $(run_testcase)" -%.multicpptest: +%.multicpptest: $(setup) - $(PKGDIRSETUP) - +echo $@ (cd $(JAVA_PACKAGE) && $(swig_and_compile_multi_cpp)) - $echo $@ (run_testcase) + +echo "$@ ($(PKGDIRSETUP) && $(swig_and_compile_multi_cpp))" + echo "$@ $(run_testcase)" # don't duplicate $(setup), just add explicit $(PKGDIRSETUP) # This doesn't work yet since for PKGPRAGMA test, PKGDIRSETUP deletes |