Merge nodejs/master to xplat

Merge '6342988053' as of 2017-05-17 into xplat PR-URL: #245 Reviewed-By: Kyle Farnung <[email protected]>
nodejs · May 18, 2017 · d07825c · d07825c
2 parents a8d0006 + 6342988
commit d07825c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 48 deletions.
diff --git a/Makefile b/Makefile
@@ -12,6 +12,7 @@ LOGLEVEL ?= silent
 OSTYPE := $(shell uname -s | tr '[A-Z]' '[a-z]')
 COVTESTS ?= test
 GTEST_FILTER ?= "*"
+GNUMAKEFLAGS += --no-print-directory
 
 ifdef JOBS
   PARALLEL_ARGS = -j $(JOBS)
@@ -404,13 +405,18 @@ test-npm-publish: $(NODE_EXE)
 test-addons-napi: test-build-addons-napi
 	$(PYTHON) tools/test.py --mode=release addons-napi
 
+test-addons-napi-clean:
+	$(RM) -r test/addons-napi/*/build
+	$(RM) test/addons-napi/.buildstamp
+
 test-addons: test-build test-addons-napi
 	$(PYTHON) tools/test.py --mode=release addons
 
 test-addons-clean:
-	$(RM) -rf test/addons/??_*/
-	$(RM) -rf test/addons/*/build
+	$(RM) -r test/addons/??_*/
+	$(RM) -r test/addons/*/build
 	$(RM) test/addons/.buildstamp test/addons/.docbuildstamp
+	$(MAKE) test-addons-napi-clean
 
 test-timers:
 	$(MAKE) --directory=tools faketime
@@ -976,6 +982,7 @@ endif
   test-addons \
   test-addons-clean \
   test-addons-napi \
+  test-addons-napi-clean \
   test-all \
   test-ci \
   test-ci-js \

diff --git a/benchmark/timers/set-immediate-depth.js b/benchmark/timers/set-immediate-depth.js
diff --git a/configure b/configure
@@ -40,6 +40,7 @@ import nodedownload
 # imports in tools/
 sys.path.insert(0, os.path.join(root_dir, 'tools'))
 import getmoduleversion
+from gyp_node import run_gyp
 
 # parse our options
 parser = optparse.OptionParser()
@@ -1395,7 +1396,7 @@ config = '\n'.join(map('='.join, config.iteritems())) + '\n'
 
 write('config.mk', do_not_edit + config)
 
-gyp_args = [sys.executable, 'tools/gyp_node.py', '--no-parallel']
+gyp_args = ['--no-parallel']
 
 if options.use_xcode:
   gyp_args += ['-f', 'xcode']
@@ -1414,4 +1415,4 @@ gyp_args += args
 if warn.warned:
   warn('warnings were emitted in the configure phase')
 
-sys.exit(subprocess.call(gyp_args))
+run_gyp(gyp_args)
diff --git a/src/node.cc b/src/node.cc
@@ -4012,8 +4012,8 @@ static void ParseArgs(int* argc,
     } else if (strcmp(arg, "--") == 0) {
       index += 1;
       break;
-    } else if (strcmp(arg, "--abort-on-uncaught-exception") ||
-               strcmp(arg, "--abort_on_uncaught_exception")) {
+    } else if (strcmp(arg, "--abort-on-uncaught-exception") == 0 ||
+               strcmp(arg, "--abort_on_uncaught_exception") == 0) {
       abort_on_uncaught_exception = true;
       // Also a V8 option.  Pass through as-is.
       new_v8_argv[new_v8_argc] = arg;

diff --git a/test/parallel/test-tls-wrap-event-emmiter.js b/test/parallel/test-tls-wrap-event-emmiter.js
@@ -6,6 +6,10 @@
  */
 
 const common = require('../common');
+if (!common.hasCrypto) {
+  common.skip('missing crypto');
+  return;
+}
 const assert = require('assert');
 
 const TlsSocket = require('tls').TLSSocket;

diff --git a/tools/gyp_node.py b/tools/gyp_node.py
@@ -13,27 +13,14 @@
 output_dir = os.path.join(os.path.abspath(node_root), 'out')
 
 def run_gyp(args):
-  rc = gyp.main(args)
-  if rc != 0:
-    print 'Error running GYP'
-    sys.exit(rc)
-
-if __name__ == '__main__':
-  args = sys.argv[1:]
-
   # GYP bug.
   # On msvs it will crash if it gets an absolute path.
   # On Mac/make it will crash if it doesn't get an absolute path.
-  if sys.platform == 'win32':
-    args.append(os.path.join(node_root, 'node.gyp'))
-    common_fn  = os.path.join(node_root, 'common.gypi')
-    options_fn = os.path.join(node_root, 'config.gypi')
-    options_fips_fn = os.path.join(node_root, 'config_fips.gypi')
-  else:
-    args.append(os.path.join(os.path.abspath(node_root), 'node.gyp'))
-    common_fn  = os.path.join(os.path.abspath(node_root), 'common.gypi')
-    options_fn = os.path.join(os.path.abspath(node_root), 'config.gypi')
-    options_fips_fn = os.path.join(os.path.abspath(node_root), 'config_fips.gypi')
+  a_path = node_root if sys.platform == 'win32' else os.path.abspath(node_root)
+  args.append(os.path.join(a_path, 'node.gyp'))
+  common_fn = os.path.join(a_path, 'common.gypi')
+  options_fn = os.path.join(a_path, 'config.gypi')
+  options_fips_fn = os.path.join(a_path, 'config_fips.gypi')
 
   if os.path.exists(common_fn):
     args.extend(['-I', common_fn])
@@ -63,5 +50,11 @@ def run_gyp(args):
   args.append('-Dlinux_use_bundled_gold=0')
   args.append('-Dlinux_use_gold_flags=0')
 
-  gyp_args = list(args)
-  run_gyp(gyp_args)
+  rc = gyp.main(args)
+  if rc != 0:
+    print 'Error running GYP'
+    sys.exit(rc)
+
+
+if __name__ == '__main__':
+  run_gyp(sys.argv[1:])