diff options
| -rw-r--r-- | Examples/test-suite/guile/Makefile.in | 13 | ||||
| -rw-r--r-- | Examples/test-suite/guile/guile_ext_test_external.cxx (renamed from Examples/test-suite/guilescm/guilescm_ext_test_external.cxx) | 2 | ||||
| -rw-r--r-- | Examples/test-suite/guile/guile_ext_test_runme.scm (renamed from Examples/test-suite/guilescm/guilescm_ext_test_runme.scm) | 2 | ||||
| -rw-r--r-- | Examples/test-suite/guile_ext_test.i (renamed from Examples/test-suite/guilescm_ext_test.i) | 2 | ||||
| -rw-r--r-- | Examples/test-suite/guilegh/Makefile.in (renamed from Examples/test-suite/guilescm/Makefile.in) | 29 | ||||
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | configure.ac | 12 |
7 files changed, 27 insertions, 41 deletions
diff --git a/Examples/test-suite/guile/Makefile.in b/Examples/test-suite/guile/Makefile.in index c6be92c32..455c26a66 100644 --- a/Examples/test-suite/guile/Makefile.in +++ b/Examples/test-suite/guile/Makefile.in @@ -2,14 +2,16 @@ # Makefile for guile test-suite ####################################################################### +EXTRA_TEST_CASES += guile_ext_test.externaltest + LANGUAGE = guile -VARIANT = _gh +VARIANT = SCRIPTSUFFIX = _runme.scm srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ GUILE = @GUILE@ -GUILE_RUNTIME=-runtime +GUILE_RUNTIME= C_TEST_CASES = long_long \ list_vector \ @@ -20,7 +22,7 @@ C_TEST_CASES = long_long \ include $(srcdir)/../common.mk # Overridden variables here -# none! +INCLUDES += -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/guile # Custom tests - tests with additional commandline options %.multicpptest: SWIGOPT += $(GUILE_RUNTIME) @@ -41,6 +43,11 @@ include $(srcdir)/../common.mk +$(swig_and_compile_multi_cpp) $(run_testcase) +%.externaltest: + $(setup) + +$(swig_and_compile_external) + $(run_testcase) + # Runs the testcase. A testcase is only run if # a file is found which has _runme.scm appended after the testcase name. run_testcase = \ diff --git a/Examples/test-suite/guilescm/guilescm_ext_test_external.cxx b/Examples/test-suite/guile/guile_ext_test_external.cxx index 30fa1ce7b..c4f906a97 100644 --- a/Examples/test-suite/guilescm/guilescm_ext_test_external.cxx +++ b/Examples/test-suite/guile/guile_ext_test_external.cxx @@ -1,4 +1,4 @@ -#include <guilescm_ext_test_wrap_hdr.h> +#include <guile_ext_test_wrap_hdr.h> #include <imports_a.h> SCM test_create() diff --git a/Examples/test-suite/guilescm/guilescm_ext_test_runme.scm b/Examples/test-suite/guile/guile_ext_test_runme.scm index ff3df064b..452b08ee7 100644 --- a/Examples/test-suite/guilescm/guilescm_ext_test_runme.scm +++ b/Examples/test-suite/guile/guile_ext_test_runme.scm @@ -1,4 +1,4 @@ -(dynamic-call "scm_init_guilescm_ext_test_module" (dynamic-link "./libguilescm_ext_test.so")) +(dynamic-call "scm_init_guile_ext_test_module" (dynamic-link "./libguile_ext_test.so")) ; This is a test for SF Bug 1573892 ; If IsPointer is called before TypeQuery, the test-is-pointer will fail diff --git a/Examples/test-suite/guilescm_ext_test.i b/Examples/test-suite/guile_ext_test.i index fd5655d4f..170695f6c 100644 --- a/Examples/test-suite/guilescm_ext_test.i +++ b/Examples/test-suite/guile_ext_test.i @@ -1,4 +1,4 @@ -%module guilescm_ext_test +%module guile_ext_test /* just use the imports_a.h header... for this test we only need a class */ %{ diff --git a/Examples/test-suite/guilescm/Makefile.in b/Examples/test-suite/guilegh/Makefile.in index ba1cba440..3a03d5f82 100644 --- a/Examples/test-suite/guilescm/Makefile.in +++ b/Examples/test-suite/guilegh/Makefile.in @@ -2,16 +2,13 @@ # Makefile for guile test-suite (with SCM API) ####################################################################### -EXTRA_TEST_CASES += guilescm_ext_test.externaltest - include ../guile/Makefile # Overridden variables here -INCLUDES += -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/guilescm -VARIANT = +VARIANT = _gh # Refer to the guile directory for the run scripts SCRIPTPREFIX = ../guile/ -GUILE_RUNTIME= +GUILE_RUNTIME=-runtime # Custom tests - tests with additional commandline options # none! @@ -25,25 +22,7 @@ run_testcase = \ setup = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE) (with SCM API)" ; \ - else \ - echo "$(ACTION)ing testcase $* under $(LANGUAGE) (with SCM API)" ; \ - fi - -%.externaltest: - $(local_setup) - +$(swig_and_compile_external) - $(local_run_testcase) - -# Same as setup and run_testcase, but without the SCRIPTPREFIX (so the runme comes from the guilescm directory) -local_setup = \ - if [ -f $(srcdir)/$*$(SCRIPTSUFFIX) ]; then \ - echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE) (with SCM API)" ; \ + echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE) (with GH API)" ; \ else \ - echo "$(ACTION)ing testcase $* under $(LANGUAGE) (with SCM API)" ; \ - fi - -local_run_testcase = \ - if [ -f $(srcdir)/$*$(SCRIPTSUFFIX) ]; then \ - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(GUILE) -l $(srcdir)/$*$(SCRIPTSUFFIX); \ + echo "$(ACTION)ing testcase $* under $(LANGUAGE) (with GH API)" ; \ fi diff --git a/Makefile.in b/Makefile.in index c47cdbe7c..6b7a99220 100644 --- a/Makefile.in +++ b/Makefile.in @@ -59,7 +59,7 @@ skip-tcl = test -n "@SKIP_TCL@" skip-perl5 = test -n "@SKIP_PERL5@" skip-python = test -n "@SKIP_PYTHON@" skip-java = test -n "@SKIP_JAVA@" -skip-guilescm = test -n "@SKIP_GUILESCM@" +skip-guilegh = test -n "@SKIP_GUILEGH@" skip-guile = test -n "@SKIP_GUILE@" skip-mzscheme = test -n "@SKIP_MZSCHEME@" skip-ruby = test -n "@SKIP_RUBY@" @@ -247,7 +247,7 @@ check-test-suite: \ check-perl5-test-suite \ check-python-test-suite \ check-java-test-suite \ - check-guilescm-test-suite \ + check-guilegh-test-suite \ check-guile-test-suite \ check-mzscheme-test-suite \ check-ruby-test-suite \ @@ -300,7 +300,7 @@ all-test-suite: \ all-perl5-test-suite \ all-python-test-suite \ all-java-test-suite \ - all-guilescm-test-suite \ + all-guilegh-test-suite \ all-guile-test-suite \ all-mzscheme-test-suite \ all-ruby-test-suite \ @@ -329,7 +329,7 @@ broken-test-suite: \ broken-perl5-test-suite \ broken-python-test-suite \ broken-java-test-suite \ - broken-guilescm-test-suite \ + broken-guilegh-test-suite \ broken-guile-test-suite \ broken-mzscheme-test-suite \ broken-ruby-test-suite \ diff --git a/configure.ac b/configure.ac index 83b46f520..7b259c78d 100644 --- a/configure.ac +++ b/configure.ac @@ -2268,16 +2268,16 @@ AC_SUBST(SKIP_JAVA) SKIP_GUILE= -if test -z "$GUILEINCLUDE" || test -z "$GUILELIB" || test -z "$GUILE_GH_INTERFACE"; then +if test -z "$GUILEINCLUDE" || test -z "$GUILELIB" || test -z "$GUILE_SCM_INTERFACE"; then SKIP_GUILE="1" fi AC_SUBST(SKIP_GUILE) -SKIP_GUILESCM= -if test -z "$GUILEINCLUDE" || test -z "$GUILELIB" || test -z "$GUILE_SCM_INTERFACE"; then - SKIP_GUILESCM="1" +SKIP_GUILEGH= +if test -z "$GUILEINCLUDE" || test -z "$GUILELIB" || test -z "$GUILE_GH_INTERFACE"; then + SKIP_GUILEGH="1" fi -AC_SUBST(SKIP_GUILESCM) +AC_SUBST(SKIP_GUILEGH) SKIP_MZSCHEME= @@ -2454,7 +2454,7 @@ AC_CONFIG_FILES([ \ Examples/test-suite/csharp/Makefile \ Examples/test-suite/d/Makefile \ Examples/test-suite/guile/Makefile \ - Examples/test-suite/guilescm/Makefile \ + Examples/test-suite/guilegh/Makefile \ Examples/test-suite/java/Makefile \ Examples/test-suite/mzscheme/Makefile \ Examples/test-suite/ocaml/Makefile \ |