diff options
| -rw-r--r-- | Examples/test-suite/python/Makefile.in | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/Examples/test-suite/python/Makefile.in b/Examples/test-suite/python/Makefile.in index fa64d5e31..5e8388311 100644 --- a/Examples/test-suite/python/Makefile.in +++ b/Examples/test-suite/python/Makefile.in @@ -110,19 +110,22 @@ VALGRIND_OPT += --suppressions=pythonswig.supp # Rules for the different types of tests %.cpptest: + +$(convert_testcase) $(setup) +$(swig_and_compile_cpp) - +$(run_testcase) + $(run_testcase) %.ctest: + +$(convert_testcase) $(setup) +$(swig_and_compile_c) - +$(run_testcase) + $(run_testcase) %.multicpptest: + +$(convert_testcase) $(setup) +$(swig_and_compile_multi_cpp) - +$(run_testcase) + $(run_testcase) # Call 2to3 to generate Python 3.x test from the Python 2.x's *_runme.py file @@ -139,17 +142,17 @@ run_python = env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=.:$(srcdir):$$PY py2_runme = $(srcdir)/$(SCRIPTPREFIX)$*$(PY2SCRIPTSUFFIX) py3_runme = $(srcdir)/$(SCRIPTPREFIX)$*$(PY3SCRIPTSUFFIX) -ifeq (,$(PY3)) run_testcase = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ $(run_python);\ fi + +ifeq (,$(PY3)) +convert_testcase = else -run_testcase = \ +convert_testcase = \ if [ -f $(py2_runme) ]; then \ - $(MAKE) -f $(srcdir)/Makefile $(py3_runme) && $(run_python); \ - elif [ -f $(py3_runme) ]; then \ - $(run_python); \ + $(MAKE) -f $(srcdir)/Makefile $(py3_runme); \ fi endif |