test: use const for all require() calls

PR-URL: https://github.com/nodejs/node/pull/10550
Reviewed-By: Rich Trott <rtrott@gmail.com>

test/addons/async-hello-world/test.js

@@ -1,6 +1,6 @@
 'use strict';
 const common = require('../../common');
-var assert = require('assert');
+const assert = require('assert');
 const binding = require(`./build/${common.buildType}/binding`);
 
 binding(5, common.mustCall(function(err, val) {

test/addons/hello-world-function-export/test.js

@@ -1,6 +1,6 @@
 'use strict';
 const common = require('../../common');
-var assert = require('assert');
+const assert = require('assert');
 const binding = require(`./build/${common.buildType}/binding`);
 assert.strictEqual(binding(), 'world');
 console.log('binding.hello() =', binding());

test/addons/hello-world/test.js

@@ -1,6 +1,6 @@
 'use strict';
 const common = require('../../common');
-var assert = require('assert');
+const assert = require('assert');
 const binding = require(`./build/${common.buildType}/binding`);
 assert.strictEqual(binding.hello(), 'world');
 console.log('binding.hello() =', binding.hello());

test/addons/load-long-path/test.js

@@ -32,6 +32,6 @@ var contents = fs.readFileSync(addonPath);
 fs.writeFileSync(addonDestinationPath, contents);
 
 // Attempt to load at long path destination
-var addon = require(addonDestinationPath);
+const addon = require(addonDestinationPath);
 assert.notEqual(addon, null);
 assert.strictEqual(addon.hello(), 'world');

test/addons/repl-domain-abort/test.js

@@ -1,9 +1,9 @@
 'use strict';
-var common = require('../../common');
-var assert = require('assert');
-var repl = require('repl');
-var stream = require('stream');
-var path = require('path');
+const common = require('../../common');
+const assert = require('assert');
+const repl = require('repl');
+const stream = require('stream');
+const path = require('path');
 var buildType = process.config.target_defaults.default_configuration;
 var buildPath = path.join(__dirname, 'build', buildType, 'binding');
 // On Windows, escape backslashes in the path before passing it to REPL.

test/debugger/helper-debugger-repl.js

@@ -1,7 +1,7 @@
 'use strict';
 const common = require('../common');
-var assert = require('assert');
-var spawn = require('child_process').spawn;
+const assert = require('assert');
+const spawn = require('child_process').spawn;
 
 process.env.NODE_DEBUGGER_TIMEOUT = 2000;
 var port = common.PORT;

test/debugger/test-debugger-repl-break-in-module.js

@@ -1,6 +1,6 @@
 'use strict';
 require('../common');
-var repl = require('./helper-debugger-repl.js');
+const repl = require('./helper-debugger-repl.js');
 
 repl.startDebugger('break-in-module/main.js');
 

test/debugger/test-debugger-repl-restart.js

@@ -1,6 +1,6 @@
 'use strict';
 require('../common');
-var repl = require('./helper-debugger-repl.js');
+const repl = require('./helper-debugger-repl.js');
 
 repl.startDebugger('breakpoints.js');
 var linesWithBreakpoint = [

test/debugger/test-debugger-repl-term.js

@@ -2,7 +2,7 @@
 require('../common');
 process.env.NODE_FORCE_READLINE = 1;
 
-var repl = require('./helper-debugger-repl.js');
+const repl = require('./helper-debugger-repl.js');
 
 repl.startDebugger('breakpoints.js');
 

test/debugger/test-debugger-repl-utf8.js

@@ -1,5 +1,5 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
 var script = common.fixturesDir + '/breakpoints_utf8.js';
 process.env.NODE_DEBUGGER_TEST_SCRIPT = script;
 

test/debugger/test-debugger-repl.js

@@ -1,6 +1,6 @@
 'use strict';
 require('../common');
-var repl = require('./helper-debugger-repl.js');
+const repl = require('./helper-debugger-repl.js');
 
 repl.startDebugger('breakpoints.js');
 

test/disabled/test-debug-brk-file.js

@@ -1,9 +1,9 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
-var spawn = require('child_process').spawn;
-var path = require('path');
-var net = require('net');
+const common = require('../common');
+const assert = require('assert');
+const spawn = require('child_process').spawn;
+const path = require('path');
+const net = require('net');
 
 var isDone = false;
 var targetPath = path.resolve(common.fixturesDir, 'debug-target.js');

test/disabled/test-dgram-send-error.js

@@ -10,7 +10,7 @@
 const common = require('../common');
 var ITERATIONS = 1000;
 
-var assert = require('assert'),
+const assert = require('assert'),
     dgram = require('dgram');
 
 var buf = Buffer.alloc(1024, 42);

test/disabled/test-fs-largefile.js

@@ -1,7 +1,7 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
-var path = require('path'),
+const common = require('../common');
+const assert = require('assert');
+const path = require('path'),
     fs = require('fs'),
     filepath = path.join(common.tmpDir, 'large.txt'),
     fd = fs.openSync(filepath, 'w+'),

test/disabled/test-http-abort-stream-end.js

@@ -1,8 +1,8 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
+const common = require('../common');
+const assert = require('assert');
 
-var http = require('http');
+const http = require('http');
 
 var maxSize = 1024;
 var size = 0;

test/disabled/test-https-loop-to-google.js

@@ -5,8 +5,8 @@
 // Tested on node 0.5.0-pre commit 9851574
 
 
-var common = require('../common');
-var https = require('https');
+const common = require('../common');
+const https = require('https');
 
 for (var i = 0; i < 10; ++i) {
   https.get({

test/disabled/test-readline.js

@@ -1,9 +1,9 @@
 'use strict';
 // Can't test this when 'make test' doesn't assign a tty to the stdout.
 // Yet another use-case for require('tty').spawn ?
-var common = require('../common');
-var assert = require('assert');
-var readline = require('readline');
+const common = require('../common');
+const assert = require('assert');
+const readline = require('readline');
 
 var key = {
   xterm: {

test/disabled/test-sendfd.js

@@ -26,15 +26,15 @@
 //     seen in a response yet. This is intended to ensure that all blobs
 //     sent out have been relayed back to us.
 
-var common = require('../common');
-var assert = require('assert');
+const common = require('../common');
+const assert = require('assert');
 
-var buffer = require('buffer');
-var child_process = require('child_process');
-var fs = require('fs');
-var net = require('net');
+const buffer = require('buffer');
+const child_process = require('child_process');
+const fs = require('fs');
+const net = require('net');
 var netBinding = process.binding('net');
-var path = require('path');
+const path = require('path');
 
 var DATA = {
   'ppid' : process.pid,

test/disabled/test-setuidgid.js

@@ -1,7 +1,7 @@
 'use strict';
 // Requires special privileges
-var common = require('../common');
-var assert = require('assert');
+const common = require('../common');
+const assert = require('assert');
 
 var oldgid = process.getgid();
 process.setgid('nobody');

test/disabled/tls_server.js

@@ -1,11 +1,11 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
+const common = require('../common');
+const assert = require('assert');
 
-var util = require('util');
-var net = require('net');
-var fs = require('fs');
-var crypto = require('crypto');
+const util = require('util');
+const net = require('net');
+const fs = require('fs');
+const crypto = require('crypto');
 
 var keyPem = fs.readFileSync(common.fixturesDir + '/cert.pem');
 var certPem = fs.readFileSync(common.fixturesDir + '/cert.pem');

test/fixtures/GH-892-request.js

@@ -1,8 +1,8 @@
 // Called by test/pummel/test-regress-GH-892.js
 
-var https = require('https');
-var fs = require('fs');
-var assert = require('assert');
+const https = require('https');
+const fs = require('fs');
+const assert = require('assert');
 
 var PORT = parseInt(process.argv[2]);
 var bytesExpected = parseInt(process.argv[3]);

test/fixtures/a.js

@@ -1,4 +1,4 @@
-var c = require('./b/c');
+const c = require('./b/c');
 
 console.error('load fixtures/a.js');
 

test/fixtures/a1.js

@@ -1,4 +1,4 @@
-var c = require('./b/c');
+const c = require('./b/c');
 
 console.error('load fixtures/a.js');
 

test/fixtures/b/c.js

@@ -1,8 +1,8 @@
-var d = require('./d');
+const d = require('./d');
 
-var assert = require('assert');
+const assert = require('assert');
 
-var package = require('./package');
+const package = require('./package');
 
 assert.equal('world', package.hello);
 

test/fixtures/break-in-module/main.js

@@ -1,4 +1,4 @@
-var mod = require('./mod.js');
+const mod = require('./mod.js');
 mod.hello();
 mod.hello();
 debugger;

test/fixtures/child-process-spawn-node.js

@@ -1,4 +1,4 @@
-var assert = require('assert');
+const assert = require('assert');
 
 function onmessage(m) {
   console.log('CHILD got message:', m);

test/fixtures/child_process_should_emit_error.js

@@ -1,4 +1,4 @@
-var exec = require('child_process').exec;
+const exec = require('child_process').exec;
 
 [0, 1].forEach(function(i) {
   exec('ls', function(err, stdout, stderr) {

test/fixtures/cluster-preload-test.js

@@ -1,4 +1,4 @@
-var cluster = require('cluster');
+const cluster = require('cluster');
 if (cluster.isMaster) {
   cluster.fork(); // one child
   cluster.on('exit', function(worker, code, signal) {

test/fixtures/cluster-preload.js

@@ -1,12 +1,12 @@
-var assert = require('assert');
+const assert = require('assert');
 
 // https://github.com/nodejs/node/issues/1803
 // this module is used as a preload module. It should have a parent with the
 // module search paths initialized from the current working directory
 assert.ok(module.parent);
-var expectedPaths = require('module')._nodeModulePaths(process.cwd());
+const expectedPaths = require('module')._nodeModulePaths(process.cwd());
 assert.deepEqual(module.parent.paths, expectedPaths);
 
-var cluster = require('cluster');
+const cluster = require('cluster');
 cluster.isMaster || process.exit(42 + cluster.worker.id); // +42 to distinguish
 // from exit(1) for other random reasons

test/fixtures/create-file.js

@@ -1,4 +1,4 @@
-var fs = require('fs');
+const fs = require('fs');
 
 var file_name = process.argv[2];
 var file_size = parseInt(process.argv[3]);

test/fixtures/cycles/folder/foo.js

@@ -1,4 +1,4 @@
-var root = require('./../root');
+const root = require('./../root');
 
 exports.hello = function() {
   return root.calledFromFoo();

test/fixtures/cycles/root.js

@@ -1,4 +1,4 @@
-var foo = exports.foo = require('./folder/foo');
+const foo = exports.foo = require('./folder/foo');
 
 exports.hello = 'hello';
 exports.sayHello = function() {

test/fixtures/echo-close-check.js

@@ -1,7 +1,7 @@
-var common = require('../common');
-var assert = require('assert');
-var net = require('net');
-var fs = require('fs');
+const common = require('../common');
+const assert = require('assert');
+const net = require('net');
+const fs = require('fs');
 
 process.stdout.write('hello world\r\n');
 

test/fixtures/echo.js

@@ -1,5 +1,5 @@
-var common = require('../common');
-var assert = require('assert');
+const common = require('../common');
+const assert = require('assert');
 
 process.stdout.write('hello world\r\n');
 

test/fixtures/listen-on-socket-and-exit.js

@@ -1,7 +1,7 @@
 // child process that listens on a socket, allows testing of an EADDRINUSE condition
 
-var common = require('../common');
-var net = require('net');
+const common = require('../common');
+const net = require('net');
 
 common.refreshTmpDir();
 

test/fixtures/module-require/parent/index.js

@@ -1,4 +1,4 @@
-var child = require('../child');
+const child = require('../child');
 //console.log(child.module.require, child.module);
 console.log(child.module.require('target'));
 console.log(child.loaded);

test/fixtures/node_modules/baz/index.js

@@ -1,7 +1,7 @@
 console.error(__filename);
 console.error(module.paths.join('\n') + '\n');
 // this should work, and get the one that doesn't throw
-var assert = require('assert');
+const assert = require('assert');
 assert.equal(require('bar'), require('../bar.js'));
 
 // this should work, and get the one in ./node_modules/asdf.js

test/fixtures/node_modules/foo.js

@@ -1,4 +1,4 @@
 console.error(__filename);
 console.error(module.paths.join('\n') + '\n');
-var assert = require('assert');
+const assert = require('assert');
 assert.equal(require('baz'), require('./baz/index.js'));

test/fixtures/not-main-module.js

@@ -1,4 +1,4 @@
-var assert = require('assert');
+const assert = require('assert');
 assert.notEqual(module, require.main, 'require.main should not == module');
 assert.notEqual(module, process.mainModule,
                 'process.mainModule should not === module');

test/fixtures/parent-process-nonpersistent.js

@@ -1,5 +1,5 @@
 
-var spawn = require('child_process').spawn,
+const spawn = require('child_process').spawn,
     path = require('path'),
     childPath = path.join(__dirname, 'child-process-persistent.js');
 

test/fixtures/path-resolve.js

@@ -1,4 +1,4 @@
 // Tests resolving a path in the context of a spawned process.
 // See https://github.com/nodejs/node/issues/7215
-var path = require('path');
+const path = require('path');
 console.log(path.resolve(process.argv[2]));

test/fixtures/path.js

@@ -1,5 +1,5 @@
 // This is actually more a fixture than a test. It is used to make
-var common = require('../common');
+const common = require('../common');
 // sure that require('./path') and require('path') do different things.
 // It has to be in the same directory as the test 'test-module-loading.js'
 // and it has to have the same name as an internal module.

test/fixtures/print-chars-from-buffer.js

@@ -1,4 +1,4 @@
-var assert = require('assert');
+const assert = require('assert');
 
 var n = parseInt(process.argv[2]);
 

test/fixtures/print-chars.js

@@ -1,4 +1,4 @@
-var assert = require('assert');
+const assert = require('assert');
 
 var n = parseInt(process.argv[2]);
 

test/fixtures/recvfd.js

@@ -1,7 +1,7 @@
 // See test/simple/test-sendfd.js for a complete description of what this
 // script is doing and how it fits into the test as a whole.
 
-var net = require('net');
+const net = require('net');
 
 var receivedData = [];
 var receivedFDs = [];

test/fixtures/stdio-filter.js

@@ -1,4 +1,4 @@
-var util = require('util');
+const util = require('util');
 
 var regexIn = process.argv[2];
 var replacement = process.argv[3];

test/fixtures/test-init-native/fs.js

@@ -1,5 +1,5 @@
 (function() {
-  var fs = require('fs');
+  const fs = require('fs');
   if (fs.readFile) {
     require('util').print('fs loaded successfully');
   }

test/fixtures/test-regress-GH-4015.js

@@ -1,4 +1,4 @@
-var fs = require('fs');
+const fs = require('fs');
 
 function load() {
   fs.statSync('.');

test/fixtures/uncaught-exceptions/domain.js

@@ -1,4 +1,4 @@
-var domain = require('domain');
+const domain = require('domain');
 
 var d = domain.create();
 d.on('error', function(err) {

test/gc/node_modules/bindings/README.md

@@ -35,7 +35,7 @@ Example
 and architecture is as simple as:
 
 ``` js
-var bindings = require('bindings')('binding.node')
+const bindings = require('bindings')('binding.node')
 
 // Use your bindings defined in your C files
 bindings.your_c_function()

test/gc/node_modules/bindings/bindings.js

@@ -3,7 +3,7 @@
  * Module dependencies.
  */
 
-var fs = require('fs')
+const fs = require('fs')
   , path = require('path')
   , join = path.join
   , dirname = path.dirname

test/gc/node_modules/nan/tools/1to2.js

@@ -7,7 +7,7 @@
  * MIT License <https://github.com/nodejs/nan/blob/master/LICENSE.md>
  ********************************************************************/
 
-var commander = require('commander'),
+const commander = require('commander'),
     fs = require('fs'),
     glob = require('glob'),
     groups = [],

test/gc/node_modules/weak/README.md

@@ -36,7 +36,7 @@ Here's an example of calling a `cleanup()` function on a Object before it gets
 garbage collected:
 
 ``` js
-var weak = require('weak')
+const weak = require('weak')
 
 // we are going to "monitor" this Object and invoke "cleanup"
 // before the object is garbage collected
@@ -80,7 +80,7 @@ at the highest scope possible (top-level being the best). Named functions
 work really well for this:
 
 ``` js
-var http = require('http')
+const http = require('http')
   , weak = require('weak')
 
 http.createServer(function (req, res) {

test/gc/node_modules/weak/build/Makefile

@@ -326,7 +326,7 @@ ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
 endif
 
 quiet_cmd_regen_makefile = ACTION Regenerating $@
-cmd_regen_makefile = cd $(srcdir); /Users/trott/io.js/deps/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/Users/trott/io.js/test/gc/node_modules/weak/build/config.gypi -I/Users/trott/io.js/deps/npm/node_modules/node-gyp/addon.gypi -I/Users/trott/io.js/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/trott/io.js" "-Dnode_gyp_dir=/Users/trott/io.js/deps/npm/node_modules/node-gyp" "-Dnode_lib_file=node.lib" "-Dmodule_root_dir=/Users/trott/io.js/test/gc/node_modules/weak" binding.gyp
+cmd_regen_makefile = cd $(srcdir); /Users/cjihrig/iojs/node/deps/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/Users/cjihrig/iojs/node/test/gc/node_modules/weak/build/config.gypi -I/Users/cjihrig/iojs/node/deps/npm/node_modules/node-gyp/addon.gypi -I/Users/cjihrig/iojs/node/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/cjihrig/iojs/node" "-Dnode_gyp_dir=/Users/cjihrig/iojs/node/deps/npm/node_modules/node-gyp" "-Dnode_lib_file=node.lib" "-Dmodule_root_dir=/Users/cjihrig/iojs/node/test/gc/node_modules/weak" binding.gyp
 Makefile: $(srcdir)/../../../../deps/npm/node_modules/node-gyp/addon.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp $(srcdir)/../../../../common.gypi
 	$(call do_cmd,regen_makefile)
 

test/gc/node_modules/weak/build/config.gypi

@@ -9,47 +9,58 @@
   },
   "variables": {
     "asan": 0,
+    "coverage": "false",
+    "debug_devtools": "node",
+    "force_dynamic_crt": 0,
     "host_arch": "x64",
-    "icu_data_file": "icudt57l.dat",
-    "icu_data_in": "../../deps/icu-small/source/data/in/icudt57l.dat",
+    "icu_data_file": "icudt58l.dat",
+    "icu_data_in": "../../deps/icu-small/source/data/in/icudt58l.dat",
     "icu_endianness": "l",
     "icu_gyp_path": "tools/icu/icu-generic.gyp",
     "icu_locales": "en,root",
     "icu_path": "deps/icu-small",
     "icu_small": "true",
-    "icu_ver_major": "57",
+    "icu_ver_major": "58",
     "llvm_version": 0,
     "node_byteorder": "little",
+    "node_enable_d8": "false",
     "node_enable_v8_vtunejit": "false",
     "node_install_npm": "true",
+    "node_module_version": 51,
     "node_no_browser_globals": "false",
     "node_prefix": "/usr/local",
     "node_release_urlbase": "",
+    "node_shared": "false",
     "node_shared_cares": "false",
     "node_shared_http_parser": "false",
     "node_shared_libuv": "false",
     "node_shared_openssl": "false",
     "node_shared_zlib": "false",
     "node_tag": "",
+    "node_use_bundled_v8": "true",
     "node_use_dtrace": "true",
     "node_use_etw": "false",
     "node_use_lttng": "false",
     "node_use_openssl": "true",
     "node_use_perfctr": "false",
+    "node_use_v8_platform": "true",
     "openssl_fips": "",
     "openssl_no_asm": 0,
+    "shlib_suffix": "51.dylib",
     "target_arch": "x64",
     "uv_parent_path": "/deps/uv/",
     "uv_use_dtrace": "true",
     "v8_enable_gdbjit": 0,
     "v8_enable_i18n_support": 1,
+    "v8_inspector": "true",
     "v8_no_strict_aliasing": 1,
     "v8_optimized_debug": 0,
     "v8_random_seed": 0,
     "v8_use_snapshot": "true",
     "want_separate_host_toolset": 0,
-    "xcode_version": "7.0",
-    "nodedir": "/Users/trott/io.js",
+    "want_separate_host_toolset_mkpeephole": 0,
+    "xcode_version": "8.0",
+    "nodedir": "/Users/cjihrig/iojs/node",
     "copy_dev_lib": "false",
     "standalone_static_library": 1
   }

test/gc/node_modules/weak/build/weakref.target.mk

@@ -4,6 +4,9 @@ TOOLSET := target
 TARGET := weakref
 DEFS_Debug := \
 	'-DNODE_GYP_MODULE_NAME=weakref' \
+	'-DUSING_UV_SHARED=1' \
+	'-DUSING_V8_SHARED=1' \
+	'-DV8_DEPRECATION_WARNINGS=1' \
 	'-D_DARWIN_USE_64_BIT_INODE=1' \
 	'-D_LARGEFILE_SOURCE' \
 	'-D_FILE_OFFSET_BITS=64' \
@@ -29,6 +32,7 @@ CFLAGS_C_Debug := \
 # Flags passed to only C++ files.
 CFLAGS_CC_Debug := \
 	-std=gnu++0x \
+	-stdlib=libc++ \
 	-fno-rtti \
 	-fno-exceptions \
 	-fno-threadsafe-statics \
@@ -41,14 +45,17 @@ CFLAGS_OBJC_Debug :=
 CFLAGS_OBJCC_Debug :=
 
 INCS_Debug := \
-	-I/Users/trott/io.js/include/node \
-	-I/Users/trott/io.js/src \
-	-I/Users/trott/io.js/deps/uv/include \
-	-I/Users/trott/io.js/deps/v8/include \
+	-I/Users/cjihrig/iojs/node/include/node \
+	-I/Users/cjihrig/iojs/node/src \
+	-I/Users/cjihrig/iojs/node/deps/uv/include \
+	-I/Users/cjihrig/iojs/node/deps/v8/include \
 	-I$(srcdir)/../nan
 
 DEFS_Release := \
 	'-DNODE_GYP_MODULE_NAME=weakref' \
+	'-DUSING_UV_SHARED=1' \
+	'-DUSING_V8_SHARED=1' \
+	'-DV8_DEPRECATION_WARNINGS=1' \
 	'-D_DARWIN_USE_64_BIT_INODE=1' \
 	'-D_LARGEFILE_SOURCE' \
 	'-D_FILE_OFFSET_BITS=64' \
@@ -72,6 +79,7 @@ CFLAGS_C_Release := \
 # Flags passed to only C++ files.
 CFLAGS_CC_Release := \
 	-std=gnu++0x \
+	-stdlib=libc++ \
 	-fno-rtti \
 	-fno-exceptions \
 	-fno-threadsafe-statics \
@@ -84,10 +92,10 @@ CFLAGS_OBJC_Release :=
 CFLAGS_OBJCC_Release :=
 
 INCS_Release := \
-	-I/Users/trott/io.js/include/node \
-	-I/Users/trott/io.js/src \
-	-I/Users/trott/io.js/deps/uv/include \
-	-I/Users/trott/io.js/deps/v8/include \
+	-I/Users/cjihrig/iojs/node/include/node \
+	-I/Users/cjihrig/iojs/node/src \
+	-I/Users/cjihrig/iojs/node/deps/uv/include \
+	-I/Users/cjihrig/iojs/node/deps/v8/include \
 	-I$(srcdir)/../nan
 
 OBJS := \
@@ -125,7 +133,8 @@ LDFLAGS_Debug := \
 	-Wl,-search_paths_first \
 	-mmacosx-version-min=10.7 \
 	-arch x86_64 \
-	-L$(builddir)
+	-L$(builddir) \
+	-stdlib=libc++
 
 LIBTOOLFLAGS_Debug := \
 	-undefined dynamic_lookup \
@@ -138,7 +147,8 @@ LDFLAGS_Release := \
 	-Wl,-search_paths_first \
 	-mmacosx-version-min=10.7 \
 	-arch x86_64 \
-	-L$(builddir)
+	-L$(builddir) \
+	-stdlib=libc++
 
 LIBTOOLFLAGS_Release := \
 	-undefined dynamic_lookup \

test/gc/node_modules/weak/lib/weak.js

@@ -3,8 +3,8 @@
  * Module dependencies.
  */
 
-var Emitter = require('events').EventEmitter;
-var bindings = require('bindings')('weakref.node');
+const Emitter = require('events').EventEmitter;
+const bindings = require('bindings')('weakref.node');
 
 /**
  * Set global weak callback function.

test/internet/test-dgram-send-cb-quelches-error.js

@@ -1,9 +1,9 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
 var mustCall = common.mustCall;
-var assert = require('assert');
-var dgram = require('dgram');
-var dns = require('dns');
+const assert = require('assert');
+const dgram = require('dgram');
+const dns = require('dns');
 
 var socket = dgram.createSocket('udp4');
 var buffer = Buffer.from('gary busey');

test/internet/test-dns-cares-domains.js

@@ -1,8 +1,8 @@
 'use strict';
 require('../common');
-var assert = require('assert');
-var dns = require('dns');
-var domain = require('domain');
+const assert = require('assert');
+const dns = require('dns');
+const domain = require('domain');
 
 var methods = [
   'resolve4',

test/internet/test-dns-txt-sigsegv.js

@@ -1,7 +1,7 @@
 'use strict';
 require('../common');
-var assert = require('assert');
-var dns = require('dns');
+const assert = require('assert');
+const dns = require('dns');
 
 dns.resolveTxt('www.microsoft.com', function(err, records) {
   assert.equal(err, null);

test/internet/test-http-https-default-ports.js

@@ -1,13 +1,13 @@
 'use strict';
-var common = require('../common');
+const common = require('../common');
 
 if (!common.hasCrypto) {
   common.skip('missing crypto');
   return;
 }
-var https = require('https');
+const https = require('https');
 
-var http = require('http');
+const http = require('http');
 
 https.get('https://www.google.com/', common.mustCall(function(res) {
   res.resume();

test/internet/test-net-connect-timeout.js

@@ -4,8 +4,8 @@
 // https://groups.google.com/forum/#!topic/nodejs-dev/jR7-5UDqXkw
 
 const common = require('../common');
-var net = require('net');
-var assert = require('assert');
+const net = require('net');
+const assert = require('assert');
 
 var start = new Date();
 

test/internet/test-net-connect-unref.js

@@ -1,6 +1,6 @@
 'use strict';
 const common = require('../common');
-var net = require('net');
+const net = require('net');
 
 var client;
 var TIMEOUT = 10 * 1000;

test/internet/test-tls-connnect-melissadata.js

@@ -2,13 +2,13 @@
 // Test for authorized access to the server which has a cross root
 // certification between Starfield Class 2 and ValiCert Class 2
 
-var common = require('../common');
+const common = require('../common');
 if (!common.hasCrypto) {
   common.skip('missing crypto');
   return;
 }
 
-var tls = require('tls');
+const tls = require('tls');
 var socket = tls.connect(443, 'address.melissadata.net', function() {
   socket.resume();
   socket.destroy();

test/message/error_exit.js

@@ -1,6 +1,6 @@
 'use strict';
 require('../common');
-var assert = require('assert');
+const assert = require('assert');
 
 process.on('exit', function(code) {
   console.error('Exiting with code=%d', code);

test/message/eval_messages.js

@@ -2,7 +2,7 @@
 
 require('../common');
 
-var spawn = require('child_process').spawn;
+const spawn = require('child_process').spawn;
 
 function run(cmd, strict, cb) {
   var args = [];

test/message/stdin_messages.js

@@ -2,7 +2,7 @@
 
 require('../common');
 
-var spawn = require('child_process').spawn;
+const spawn = require('child_process').spawn;
 
 function run(cmd, strict, cb) {
   var args = [];

test/message/undefined_reference_in_new_context.js

@@ -1,6 +1,6 @@
 'use strict';
 require('../common');
-var vm = require('vm');
+const vm = require('vm');
 
 console.error('before');
 

test/message/vm_display_runtime_error.js

@@ -1,6 +1,6 @@
 'use strict';
 require('../common');
-var vm = require('vm');
+const vm = require('vm');
 
 console.error('beginning');
 

test/message/vm_display_syntax_error.js

@@ -1,6 +1,6 @@
 'use strict';
 require('../common');
-var vm = require('vm');
+const vm = require('vm');
 
 console.error('beginning');
 

test/message/vm_dont_display_runtime_error.js

@@ -1,6 +1,6 @@
 'use strict';
 require('../common');
-var vm = require('vm');
+const vm = require('vm');
 
 console.error('beginning');
 

test/message/vm_dont_display_syntax_error.js

@@ -1,6 +1,6 @@
 'use strict';
 require('../common');
-var vm = require('vm');
+const vm = require('vm');
 
 console.error('beginning');
 

test/parallel/test-assert.js

@@ -1,7 +1,7 @@
 'use strict';
 require('../common');
-var assert = require('assert');
-var a = require('assert');
+const assert = require('assert');
+const a = require('assert');
 
 function makeBlock(f) {
   var args = Array.prototype.slice.call(arguments, 1);

test/parallel/test-beforeexit-event-exit.js

@@ -1,6 +1,6 @@
 'use strict';
 require('../common');
-var assert = require('assert');
+const assert = require('assert');
 
 process.on('beforeExit', function() {
   assert(false, 'exit should not allow this to occur');

test/parallel/test-child-process-constructor.js

@@ -1,8 +1,8 @@
 'use strict';
 
 require('../common');
-var assert = require('assert');
-var child_process = require('child_process');
+const assert = require('assert');
+const child_process = require('child_process');
 var ChildProcess = child_process.ChildProcess;
 assert.strictEqual(typeof ChildProcess, 'function');
 

test/parallel/test-child-process-default-options.js

@@ -1,8 +1,8 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
+const common = require('../common');
+const assert = require('assert');
 
-var spawn = require('child_process').spawn;
+const spawn = require('child_process').spawn;
 
 process.env.HELLO = 'WORLD';
 

test/parallel/test-child-process-env.js

@@ -1,8 +1,8 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
+const common = require('../common');
+const assert = require('assert');
 
-var spawn = require('child_process').spawn;
+const spawn = require('child_process').spawn;
 
 var env = {
   'HELLO': 'WORLD'

test/parallel/test-child-process-exit-code.js

@@ -1,8 +1,8 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
-var spawn = require('child_process').spawn;
-var path = require('path');
+const common = require('../common');
+const assert = require('assert');
+const spawn = require('child_process').spawn;
+const path = require('path');
 
 var exitScript = path.join(common.fixturesDir, 'exit.js');
 var exitChild = spawn(process.argv[0], [exitScript, 23]);

test/parallel/test-child-process-fork-exec-argv.js

@@ -1,7 +1,7 @@
 'use strict';
 require('../common');
-var assert = require('assert');
-var child_process = require('child_process');
+const assert = require('assert');
+const child_process = require('child_process');
 var spawn = child_process.spawn;
 var fork = child_process.fork;
 

test/parallel/test-child-process-fork-exec-path.js

@@ -1,8 +1,8 @@
 'use strict';
 const common = require('../common');
-var assert = require('assert');
-var fs = require('fs');
-var path = require('path');
+const assert = require('assert');
+const fs = require('fs');
+const path = require('path');
 var msg = {test: 'this'};
 var nodePath = process.execPath;
 var copyPath = path.join(common.tmpDir, 'node-copy.exe');
@@ -25,7 +25,7 @@ if (process.env.FORK) {
   // slow but simple
   var envCopy = JSON.parse(JSON.stringify(process.env));
   envCopy.FORK = 'true';
-  var child = require('child_process').fork(__filename, {
+  const child = require('child_process').fork(__filename, {
     execPath: copyPath,
     env: envCopy
   });

test/parallel/test-child-process-fork-net2.js

@@ -1,8 +1,8 @@
 'use strict';
 const common = require('../common');
-var assert = require('assert');
-var fork = require('child_process').fork;
-var net = require('net');
+const assert = require('assert');
+const fork = require('child_process').fork;
+const net = require('net');
 var count = 12;
 
 if (process.argv[2] === 'child') {

test/parallel/test-child-process-fork-ref.js

@@ -1,7 +1,7 @@
 'use strict';
 require('../common');
-var assert = require('assert');
-var fork = require('child_process').fork;
+const assert = require('assert');
+const fork = require('child_process').fork;
 
 if (process.argv[2] === 'child') {
   process.send('1');

test/parallel/test-child-process-fork-ref2.js

@@ -1,6 +1,6 @@
 'use strict';
 require('../common');
-var fork = require('child_process').fork;
+const fork = require('child_process').fork;
 
 if (process.argv[2] === 'child') {
   console.log('child -> call disconnect');

test/parallel/test-child-process-fork.js

@@ -1,7 +1,7 @@
 'use strict';
 const common = require('../common');
-var assert = require('assert');
-var fork = require('child_process').fork;
+const assert = require('assert');
+const fork = require('child_process').fork;
 var args = ['foo', 'bar'];
 
 var n = fork(common.fixturesDir + '/child-process-spawn-node.js', args);

test/parallel/test-child-process-fork3.js

@@ -1,5 +1,5 @@
 'use strict';
-var common = require('../common');
-var child_process = require('child_process');
+const common = require('../common');
+const child_process = require('child_process');
 
 child_process.fork(common.fixturesDir + '/empty.js'); // should not hang

test/parallel/test-child-process-internal.js

@@ -1,6 +1,6 @@
 'use strict';
 const common = require('../common');
-var assert = require('assert');
+const assert = require('assert');
 
 //messages
 var PREFIX = 'NODE_';
@@ -18,7 +18,7 @@ if (process.argv[2] === 'child') {
 
 } else {
 
-  var fork = require('child_process').fork;
+  const fork = require('child_process').fork;
   var child = fork(process.argv[1], ['child']);
 
   child.once('message', common.mustCall(function(data) {

test/parallel/test-child-process-set-blocking.js

@@ -1,7 +1,7 @@
 'use strict';
 const common = require('../common');
-var assert = require('assert');
-var ch = require('child_process');
+const assert = require('assert');
+const ch = require('child_process');
 
 var SIZE = 100000;
 

test/parallel/test-child-process-silent.js

@@ -1,7 +1,7 @@
 'use strict';
 require('../common');
-var assert = require('assert');
-var childProcess = require('child_process');
+const assert = require('assert');
+const childProcess = require('child_process');
 
 // Child pipe test
 if (process.argv[2] === 'pipe') {

test/parallel/test-child-process-spawnsync-env.js

@@ -1,7 +1,7 @@
 'use strict';
 require('../common');
-var assert = require('assert');
-var cp = require('child_process');
+const assert = require('assert');
+const cp = require('child_process');
 
 if (process.argv[2] === 'child') {
   console.log(process.env.foo);

test/parallel/test-child-process-spawnsync-timeout.js

@@ -1,8 +1,8 @@
 'use strict';
 require('../common');
-var assert = require('assert');
+const assert = require('assert');
 
-var spawnSync = require('child_process').spawnSync;
+const spawnSync = require('child_process').spawnSync;
 
 var TIMER = 200;
 var SLEEP = 5000;

test/parallel/test-child-process-stdin-ipc.js

@@ -1,8 +1,8 @@
 'use strict';
 const common = require('../common');
-var assert = require('assert');
+const assert = require('assert');
 
-var spawn = require('child_process').spawn;
+const spawn = require('child_process').spawn;
 
 if (process.argv[2] === 'child') {
   // Just reference stdin, it should start it

test/parallel/test-child-process-stdio-inherit.js

@@ -1,7 +1,7 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
-var spawn = require('child_process').spawn;
+const common = require('../common');
+const assert = require('assert');
+const spawn = require('child_process').spawn;
 
 if (process.argv[2] === 'parent')
   parent();

test/parallel/test-cluster-disconnect-with-no-workers.js

@@ -1,7 +1,7 @@
 'use strict';
 require('../common');
-var assert = require('assert');
-var cluster = require('cluster');
+const assert = require('assert');
+const cluster = require('cluster');
 
 var disconnected;
 

test/parallel/test-cluster-eaddrinuse.js

@@ -3,10 +3,10 @@
 // leave the master process in a confused state. Releasing the port and
 // trying again should Just Work[TM].
 
-var common = require('../common');
-var assert = require('assert');
-var fork = require('child_process').fork;
-var net = require('net');
+const common = require('../common');
+const assert = require('assert');
+const fork = require('child_process').fork;
+const net = require('net');
 
 var id = '' + process.argv[2];
 

test/parallel/test-cluster-fork-env.js

@@ -1,7 +1,7 @@
 'use strict';
 require('../common');
-var assert = require('assert');
-var cluster = require('cluster');
+const assert = require('assert');
+const cluster = require('cluster');
 
 if (cluster.isWorker) {
   const result = cluster.worker.send({

test/parallel/test-cluster-listening-port.js

@@ -1,8 +1,8 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
-var cluster = require('cluster');
-var net = require('net');
+const common = require('../common');
+const assert = require('assert');
+const cluster = require('cluster');
+const net = require('net');
 
 if (cluster.isMaster) {
   cluster.fork();

test/parallel/test-cluster-message.js

@@ -1,8 +1,8 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
-var cluster = require('cluster');
-var net = require('net');
+const common = require('../common');
+const assert = require('assert');
+const cluster = require('cluster');
+const net = require('net');
 
 function forEach(obj, fn) {
   Object.keys(obj).forEach(function(name, index) {

test/parallel/test-cluster-rr-domain-listen.js

@@ -1,7 +1,7 @@
 'use strict';
-var common = require('../common');
-var cluster = require('cluster');
-var domain = require('domain');
+const common = require('../common');
+const cluster = require('cluster');
+const domain = require('domain');
 
 // RR is the default for v0.11.9+ so the following line is redundant:
 // cluster.schedulingPolicy = cluster.SCHED_RR;
@@ -10,7 +10,7 @@ if (cluster.isWorker) {
   var d = domain.create();
   d.run(function() { });
 
-  var http = require('http');
+  const http = require('http');
   http.Server(function() { }).listen(common.PORT, '127.0.0.1');
 
 } else if (cluster.isMaster) {

test/parallel/test-cluster-send-deadlock.js

@@ -2,10 +2,10 @@
 // Testing mutual send of handles: from master to worker, and from worker to
 // master.
 
-var common = require('../common');
-var assert = require('assert');
-var cluster = require('cluster');
-var net = require('net');
+const common = require('../common');
+const assert = require('assert');
+const cluster = require('cluster');
+const net = require('net');
 
 if (cluster.isMaster) {
   var worker = cluster.fork();

test/parallel/test-cluster-setup-master-cumulative.js

@@ -1,7 +1,7 @@
 'use strict';
 require('../common');
-var assert = require('assert');
-var cluster = require('cluster');
+const assert = require('assert');
+const cluster = require('cluster');
 
 assert(cluster.isMaster);