jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix configuration for Javascript/node ctests.

Browse source
This commit is contained in:
Oliver Buchtala 2014-04-23 02:56:53 +02:00
commit 1d10a62192
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Examples/test-suite/javascript/Makefile.in
View file

@ -53,11 +53,15 @@ ifeq (node,$(JSENGINE))
constant_pointers.cpptest: GYP_CFLAGS = \"-Wno-ignored-qualifiers\" constant_pointers.cpptest: GYP_CFLAGS = \"-Wno-ignored-qualifiers\"
enum_thorough.cpptest: GYP_CFLAGS = \"-Wno-ignored-qualifiers\" enum_thorough.cpptest: GYP_CFLAGS = \"-Wno-ignored-qualifiers\"
__setup = \ # Note: we need to use swig in C parse mode, but make node-gyp believe it is c++ (via file extension)
swig_and_compile_c = \
sh ./setup_test.sh $* $(GYP_CFLAGS); \ sh ./setup_test.sh $* $(GYP_CFLAGS); \
$(SWIG) -c++ -javascript $(SWIGOPT) ../$*.i; $(SWIG) -javascript $(SWIGOPT) -o $*_wrap.cxx ../$*.i; \
$(NODEGYP) --loglevel=silent --directory $* configure build 1>>/dev/null
nodejs_swig_and_compile = \ swig_and_compile_cpp = \
sh ./setup_test.sh $* $(GYP_CFLAGS); \
$(SWIG) -c++ -javascript $(SWIGOPT) ../$*.i; \
$(NODEGYP) --loglevel=silent --directory $* configure build 1>>/dev/null $(NODEGYP) --loglevel=silent --directory $* configure build 1>>/dev/null
run_testcase = \ run_testcase = \
@ -65,16 +69,15 @@ ifeq (node,$(JSENGINE))
node $(srcdir)/$*$(SCRIPTSUFFIX); \ node $(srcdir)/$*$(SCRIPTSUFFIX); \
fi fi
%.cpptest:
$(_setup)
$(__setup)
$(nodejs_swig_and_compile)
$(run_testcase)
%.ctest: %.ctest:
$(_setup) $(_setup)
$(__setup) $(swig_and_compile_c)
$(nodejs_swig_and_compile) $(run_testcase)
%.cpptest:
$(_setup)
$(swig_and_compile_cpp)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest: