From 1f76cda125668d9b89de5e5f70a5bc1d9dc06cca Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 15 May 2018 23:30:12 +0100 Subject: [PATCH] Javascript test-suite Makefile parallel jobs Suppress warning running test-suite and examples: make[1]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule. Note that node-gyp uses make under the hood and clearing the MAKEFILE env is the only way I could find to suppress this warning. --- Examples/Makefile.in | 2 +- Examples/test-suite/javascript/Makefile.in | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 58da8ec1d..d22450ec9 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -671,7 +671,7 @@ javascript_build: $(SRCDIR_SRCS) javascript_build_cpp: $(SRCDIR_SRCS) ifeq (node,$(JSENGINE)) sed -e 's|$$srcdir|./$(SRCDIR)|g' $(SRCDIR)binding.gyp.in > binding.gyp - $(NODEGYP) --loglevel=silent configure build 1>>/dev/null + MAKEFLAGS= $(NODEGYP) --loglevel=silent configure build 1>>/dev/null else $(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(ICXXSRCS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(INCLUDES) $(JSINCLUDES) $(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(JSDYNAMICLINKING) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) diff --git a/Examples/test-suite/javascript/Makefile.in b/Examples/test-suite/javascript/Makefile.in index b430f236f..8127415f1 100644 --- a/Examples/test-suite/javascript/Makefile.in +++ b/Examples/test-suite/javascript/Makefile.in @@ -66,14 +66,14 @@ ifeq (node,$(JSENGINE)) $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile SRCDIR='$(SRCDIR)' \ SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \ SWIGOPT='-javascript $(SWIGOPT) -o $*_wrap.cxx $(srcdir)/../$*.i' swiginvoke && \ - $(COMPILETOOL) $(NODEGYP) --loglevel=silent --directory $* configure build 1>>/dev/null + MAKEFLAGS= $(COMPILETOOL) $(NODEGYP) --loglevel=silent --directory $* configure build 1>>/dev/null swig_and_compile_cpp = \ $(setup_node) && \ $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile SRCDIR='$(SRCDIR)' \ SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \ SWIGOPT='-c++ -javascript $(SWIGOPT) $(srcdir)/../$*.i' swiginvoke && \ - $(COMPILETOOL) $(NODEGYP) --loglevel=silent --directory $* configure build 1>>/dev/null + MAKEFLAGS= $(COMPILETOOL) $(NODEGYP) --loglevel=silent --directory $* configure build 1>>/dev/null run_testcase = \ if [ -f $(srcdir)/$*$(SCRIPTSUFFIX) ]; then \ @@ -83,12 +83,12 @@ ifeq (node,$(JSENGINE)) %.ctest: $(_setup) - $(swig_and_compile_c) + +$(swig_and_compile_c) $(run_testcase) %.cpptest: $(_setup) - $(swig_and_compile_cpp) + +$(swig_and_compile_cpp) $(run_testcase) %.multicpptest: