Rebase on the branch of pr #8 and fix test failures in old nodejs.

gulpjs · Dec 10, 2017 · 3df3f30 · 3df3f30
1 parent 78000dc
commit 3df3f30
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/index.js b/index.js
@@ -21,7 +21,7 @@ module.exports = function (flags, argv, forcedFlags, execute) {
 
   var index = argv.indexOf(FORBID_RESPAWNING_FLAG);
   if (index >= 0) {
-    argv = remover([FORBID_RESPAWNING_FLAG], argv);
+    argv = argv.slice(0, index).concat(argv.slice(index + 1));
     argv = remover(flags, argv);
     execute(true, process, argv);
     return;

diff --git a/lib/remover.js b/lib/remover.js
@@ -1,9 +1,11 @@
+const isV8flags = require('./is-v8flags');
+
 module.exports = function(flags, argv) {
   var args = argv.slice(0, 1);
   for (var i = 1, n = argv.length; i < n; i++) {
     var arg = argv[i];
     var flag = arg.split('=')[0];
-    if (flags.indexOf(flag) < 0) {
+    if (!isV8flags(flag, flags)) {
       args.push(arg);
     }
   }

diff --git a/test/bin/force-and-forbid-respawning.js b/test/bin/force-and-forbid-respawning.js
@@ -12,7 +12,7 @@ v8flags(function(err, flags) {
 
   var argv = process.argv.concat('--no-respawning');
 
-  flaggedRespawn(flags, argv, ['--trace-warnings'], function (ready, child) {
+  flaggedRespawn(flags, argv, ['--trace-deprecation'], function (ready, child) {
     if (ready) {
       console.log('Running!');
     } else {

diff --git a/test/bin/force-respawning.js b/test/bin/force-respawning.js
@@ -10,7 +10,7 @@ v8flags(function(err, flags) {
     return;
   }
 
-  flaggedRespawn(flags, process.argv, ['--trace-warnings'], function (ready, child) {
+  flaggedRespawn(flags, process.argv, ['--trace-deprecation'], function (ready, child) {
     if (ready) {
       console.log('Running!');
     } else {

diff --git a/test/bin/print-args.js b/test/bin/print-args.js
@@ -11,10 +11,12 @@ v8flags(function(err, flags) {
   }
 
   flaggedRespawn(flags, process.argv, [
-    '--trace-warnings',
+    '--trace-deprecation',
+/*
     '--require',
     'v8flags',
     '--v8-pool-size=2',
+*/
   ], function (ready, child, args) {
     if (ready) {
       console.log('cli args passed to app:', args.join(' '));

diff --git a/test/index.js b/test/index.js
@@ -224,18 +224,19 @@ describe('flaggedRespawn', function () {
   });
 
   describe('cli args which are passed to app', function() {
+
     it('should pass args except v8flags, forced node flags, --no-respawning when respawned', function(done) {
       var script = path.resolve(__dirname, 'bin/print-args.js');
       var cmd = [
-        'node',
+        process.argv[0],
         script,
         'aaa',
         '--harmony',
         '-q',
         '1234',
         '--cwd',
         'bbb/ccc/ddd',
-        '--experimental_extras',
+        '--prof_browser_mode',
         '-V',
       ].join(' ');
 
@@ -260,15 +261,15 @@ describe('flaggedRespawn', function () {
     it('should pass args except v8flags, forced node flags, --no-respawning when not respawned', function(done) {
       var script = path.resolve(__dirname, 'bin/print-args.js');
       var cmd = [
-        'node',
+        process.argv[0],
         script,
         'aaa',
         '--harmony',
         '-q',
         '1234',
         '--cwd',
         'bbb/ccc/ddd',
-        '--experimental_extras',
+        '--prof-browser-mode',
         '-V',
         '--no-respawning',
       ].join(' ');;