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

Only disable javascript tests if node-gyp is missing when testing node

Browse source
This commit is contained in:
William S Fulton 2014-04-21 11:37:19 +01:00
commit e6d5abb766
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Examples/Makefile.in
View file

@ -661,12 +661,14 @@ javascript_version:
ifeq (, $(ENGINE)) ifeq (, $(ENGINE))
@if [ "$(NODEJS)" != "" ]; then \ @if [ "$(NODEJS)" != "" ]; then \
echo "Node.js: `($(NODEJS) --version)`"; \ echo "Node.js: `($(NODEJS) --version)`"; \
echo "node-gyp: `($(NODEGYP) --version)`"; \
else \ else \
echo "Version depends on the interpreter"; \ echo "Version depends on the interpreter"; \
fi fi
endif endif
ifeq (node, $(ENGINE)) ifeq (node, $(ENGINE))
$(NODEJS) --version echo "Node.js: `($(NODEJS) --version)`"
echo "node-gyp: `($(NODEGYP) --version)`"
endif endif
ifeq (jsc, $(ENGINE)) ifeq (jsc, $(ENGINE))
@if [ "@JSCOREVERSION@" != "" ]; then \ @if [ "@JSCOREVERSION@" != "" ]; then \
@ -678,7 +680,6 @@ endif
ifeq (v8, $(ENGINE)) ifeq (v8, $(ENGINE))
echo "Unknown v8 version." echo "Unknown v8 version."
endif endif
echo "node-gyp: `($(NODEGYP) --version)`"
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Cleaning the Javascript examples # Cleaning the Javascript examples

11
configure.ac
View file

@ -1136,8 +1136,13 @@ else
AC_CHECK_PROGS(NODEJS, node) AC_CHECK_PROGS(NODEJS, node)
# node-gyp is needed to run the test-suite/examples for all Javascript engines if test -n "$NODEJS"; then
AC_CHECK_PROGS(NODEGYP, node-gyp) # node-gyp is needed to run the test-suite/examples
AC_CHECK_PROGS(NODEGYP, node-gyp)
if test -z "$NODEGYP"; then
NODEJS=
fi
fi
#---------------------------------------------------------------- #----------------------------------------------------------------
# Look for JavascriptCore (Webkit) settings (JSCOREINCDIR, JSCOREDYNAMICLINKING) # Look for JavascriptCore (Webkit) settings (JSCOREINCDIR, JSCOREDYNAMICLINKING)
@ -2459,7 +2464,7 @@ fi
AC_SUBST(SKIP_JAVA) AC_SUBST(SKIP_JAVA)
SKIP_JAVASCRIPT= SKIP_JAVASCRIPT=
if test -z "$JAVASCRIPT" || test -z "$NODEJS" || test -z "$NODEGYP"; then if test -z "$JAVASCRIPT" || test -z "$NODEJS" ; then
SKIP_JAVASCRIPT="1" SKIP_JAVASCRIPT="1"
fi fi
AC_SUBST(SKIP_JAVASCRIPT) AC_SUBST(SKIP_JAVASCRIPT)