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

Revert "Javascript node test-suite makefile fixes for parallel make"

Browse source 
This reverts commit f105590c0a.
This commit is contained in:
William S Fulton 2014-04-21 11:23:14 +01:00
commit e730b16fac
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -58,8 +58,7 @@ ifeq (node,$(JSENGINE))
$(SWIG) -c++ -javascript $(SWIGOPT) ../$*.i; $(SWIG) -c++ -javascript $(SWIGOPT) ../$*.i;
nodejs_swig_and_compile = \ nodejs_swig_and_compile = \
$(NODEGYP) --loglevel=silent --directory $* configure 1>>/dev/null $(NODEGYP) --loglevel=silent --directory $* configure build 1>>/dev/null
$(NODEGYP) --loglevel=silent --directory $* build 1>>/dev/null
run_testcase = \ run_testcase = \
if [ -f $(srcdir)/$*$(SCRIPTSUFFIX) ]; then \ if [ -f $(srcdir)/$*$(SCRIPTSUFFIX) ]; then \
@ -69,13 +68,13 @@ ifeq (node,$(JSENGINE))
%.cpptest: %.cpptest:
$(_setup) $(_setup)
$(__setup) $(__setup)
+$(nodejs_swig_and_compile) $(nodejs_swig_and_compile)
$(run_testcase) $(run_testcase)
%.ctest: %.ctest:
$(_setup) $(_setup)
$(__setup) $(__setup)
+$(nodejs_swig_and_compile) $(nodejs_swig_and_compile)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest: