Javascript V8 test-cases always create cpp wrappers.

This commit is contained in:
Oliver Buchtala 2013-09-06 01:40:23 +03:00
commit 492d3010ff

View file

@ -19,6 +19,7 @@ include $(srcdir)/../common.mk
SWIGOPT += -$(JSENGINE) SWIGOPT += -$(JSENGINE)
ifeq ("node",$(JSENGINE)) ifeq ("node",$(JSENGINE))
setup = \ setup = \
@ -41,7 +42,6 @@ ifeq ("node",$(JSENGINE))
node $(srcdir)/$*$(SCRIPTSUFFIX); \ node $(srcdir)/$*$(SCRIPTSUFFIX); \
fi fi
# Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
$(nodejs_swig_and_compile) $(nodejs_swig_and_compile)
@ -57,7 +57,6 @@ ifeq ("node",$(JSENGINE))
$(nodejs_swig_and_compile) $(nodejs_swig_and_compile)
$(run_testcase) $(run_testcase)
# Clean
%.clean: %.clean:
rm -rf $* rm -rf $*
@ -68,27 +67,33 @@ else
$(top_srcdir)/Tools/javascript/javascript -$(JSENGINE) $(srcdir)/$*$(SCRIPTSUFFIX); \ $(top_srcdir)/Tools/javascript/javascript -$(JSENGINE) $(srcdir)/$*$(SCRIPTSUFFIX); \
fi fi
# Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_cpp)
$(run_testcase) $(run_testcase)
%.ctest:
$(setup)
+$(swig_and_compile_c)
$(run_testcase)
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+$(swig_and_compile_multi_cpp) +$(swig_and_compile_multi_cpp)
$(run_testcase) $(run_testcase)
# Clean
%.clean: %.clean:
rm $*_wrap.cxx rm $*_wrap.cxx
endif endif
ifeq (v8,$(ENGINE))
%.ctest:
$(setup)
+$(swig_and_compile_cpp)
$(run_testcase)
endif
ifeq (jsc,$(ENGINE))
%.ctest:
$(setup)
+$(swig_and_compile_c)
$(run_testcase)
endif
clean: clean: