node can be called nodejs

Fix #402
tapjs · Sep 5, 2017 · 067dc57 · 067dc57
1 parent a335bc4
commit 067dc57
Show file tree

Hide file tree

Showing 60 changed files with 136 additions and 136 deletions.
diff --git a/scripts/generate-test-test.js b/scripts/generate-test-test.js
@@ -80,8 +80,8 @@ function generate (file, bail, buffer) {
       output = output.split(node).join('\0N2\0')
       output = output.split(path.basename(node)).join('\0N2\0')
 
-      output = output.split('\0N1\0').join('___/.*(node|iojs)(\.exe)?')
-      output = output.split('\0N2\0').join('___/.*(node|iojs)(\.exe)?/~~~')
+      output = output.split('\0N1\0').join('___/.*(node(js)?|iojs)(\.exe)?')
+      output = output.split('\0N2\0').join('___/.*(node(js)?|iojs)(\.exe)?/~~~')
 
       output = yamlishToJson(output)
 

diff --git a/test/runner-test-args.js b/test/runner-test-args.js
@@ -28,7 +28,7 @@ t.test('--test-args', function (t) {
       throw err
     }
     t.equal(stderr, '')
-    var re = /ok 1 - .*[\/\\]node ".*[\\\/]dump-args.js" "--x=y" "-q" "x"$/im
+    var re = /ok 1 - .*[\/\\](node(js)?|iojs)(\.exe)? ".*[\\\/]dump-args.js" "--x=y" "-q" "x"$/im
     t.match(stdout, re)
     t.match(stdout, /^ok 1 - .*[\\\/]dump-args.js/m)
     t.end()

diff --git a/test/test/bail-fail-spawn--bail--buffer.tap b/test/test/bail-fail-spawn--bail--buffer.tap
@@ -1,8 +1,8 @@
 TAP version 13
 not ok 1 - bail fail ___/# time=[0-9.]+(ms)?/~~~ {
-    not ok 1 - ___/.*(node|iojs)(.exe)?/~~~ ./test/test/nesting.js ___/# time=[0-9.]+(ms)?/~~~
+    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/nesting.js ___/# time=[0-9.]+(ms)?/~~~
       ---
-      {"args":["___/.*/~~~nesting.js"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1}
+      {"args":["___/.*/~~~nesting.js"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1}
       ...
     {
         not ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~ {

diff --git a/test/test/bail-fail-spawn--bail.tap b/test/test/bail-fail-spawn--bail.tap
@@ -1,6 +1,6 @@
 TAP version 13
 # Subtest: bail fail
-    # Subtest: ___/.*(node|iojs)(.exe)?/~~~ ./test/test/nesting.js
+    # Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/nesting.js
         # Subtest: nesting
             1..2
             # Subtest: first

diff --git a/test/test/bail-fail-spawn--buffer.tap b/test/test/bail-fail-spawn--buffer.tap
@@ -1,8 +1,8 @@
 TAP version 13
 not ok 1 - bail fail ___/# time=[0-9.]+(ms)?/~~~ {
-    not ok 1 - ___/.*(node|iojs)(.exe)?/~~~ ./test/test/nesting.js ___/# time=[0-9.]+(ms)?/~~~
+    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/nesting.js ___/# time=[0-9.]+(ms)?/~~~
       ---
-      {"args":["___/.*/~~~nesting.js"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1}
+      {"args":["___/.*/~~~nesting.js"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1}
       ...
     {
         not ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~ {

diff --git a/test/test/bail-fail-spawn.tap b/test/test/bail-fail-spawn.tap
@@ -1,6 +1,6 @@
 TAP version 13
 # Subtest: bail fail
-    # Subtest: ___/.*(node|iojs)(.exe)?/~~~ ./test/test/nesting.js
+    # Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/nesting.js
         # Subtest: nesting
             1..2
             # Subtest: first

diff --git a/test/test/child-text-buffer--bail--buffer.tap b/test/test/child-text-buffer--bail--buffer.tap
@@ -1,5 +1,5 @@
 TAP version 13
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~child-text-buffer.js buffer ___/# time=[0-9.]+(ms)?/~~~ {
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~child-text-buffer.js buffer ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - parent {
         not ok 1 - child {
             not ok 1 - grandchild {

diff --git a/test/test/child-text-buffer--bail.tap b/test/test/child-text-buffer--bail.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~child-text-buffer.js buffer
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~child-text-buffer.js buffer
     not ok 1 - parent {
         not ok 1 - child {
             not ok 1 - grandchild {

diff --git a/test/test/child-text-buffer--buffer.tap b/test/test/child-text-buffer--buffer.tap
@@ -1,5 +1,5 @@
 TAP version 13
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~child-text-buffer.js buffer ___/# time=[0-9.]+(ms)?/~~~ {
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~child-text-buffer.js buffer ___/# time=[0-9.]+(ms)?/~~~ {
     not ok 1 - parent {
         not ok 1 - child {
             not ok 1 - grandchild {

diff --git a/test/test/child-text-buffer.tap b/test/test/child-text-buffer.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~child-text-buffer.js buffer
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~child-text-buffer.js buffer
     not ok 1 - parent {
         not ok 1 - child {
             not ok 1 - grandchild {
@@ -19,7 +19,7 @@ TAP version 13
     1..1
     # failed 1 of 1 tests
     # failed 1 test
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~child-text-buffer.js buffer ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~child-text-buffer.js buffer ___/# time=[0-9.]+(ms)?/~~~
 
 1..1
 # failed 1 test

diff --git a/test/test/child-text-indentsub--bail--buffer.tap b/test/test/child-text-indentsub--bail--buffer.tap
@@ -1,5 +1,5 @@
 TAP version 13
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~child-text-indentsub.js indentsub ___/# time=[0-9.]+(ms)?/~~~ {
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~child-text-indentsub.js indentsub ___/# time=[0-9.]+(ms)?/~~~ {
     # Subtest: parent
         # Subtest: child
             # Subtest: grandchild

diff --git a/test/test/child-text-indentsub--bail.tap b/test/test/child-text-indentsub--bail.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~child-text-indentsub.js indentsub
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~child-text-indentsub.js indentsub
     # Subtest: parent
         # Subtest: child
             # Subtest: grandchild

diff --git a/test/test/child-text-indentsub--buffer.tap b/test/test/child-text-indentsub--buffer.tap
@@ -1,5 +1,5 @@
 TAP version 13
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~child-text-indentsub.js indentsub ___/# time=[0-9.]+(ms)?/~~~ {
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~child-text-indentsub.js indentsub ___/# time=[0-9.]+(ms)?/~~~ {
     # Subtest: parent
         # Subtest: child
             # Subtest: grandchild

diff --git a/test/test/child-text-indentsub.tap b/test/test/child-text-indentsub.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~child-text-indentsub.js indentsub
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~child-text-indentsub.js indentsub
     # Subtest: parent
         # Subtest: child
             # Subtest: grandchild
@@ -19,7 +19,7 @@ TAP version 13
     1..1
     # failed 1 of 1 tests
     # failed 1 test
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~child-text-indentsub.js indentsub ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~child-text-indentsub.js indentsub ___/# time=[0-9.]+(ms)?/~~~
 
 1..1
 # failed 1 test

diff --git a/test/test/child-text-sub--bail--buffer.tap b/test/test/child-text-sub--bail--buffer.tap
@@ -1,5 +1,5 @@
 TAP version 13
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~child-text-sub.js sub ___/# time=[0-9.]+(ms)?/~~~ {
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~child-text-sub.js sub ___/# time=[0-9.]+(ms)?/~~~ {
     # Subtest: parent
         # Subtest: child
             # Subtest: grandchild

diff --git a/test/test/child-text-sub--bail.tap b/test/test/child-text-sub--bail.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~child-text-sub.js sub
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~child-text-sub.js sub
     # Subtest: parent
         # Subtest: child
             # Subtest: grandchild

diff --git a/test/test/child-text-sub--buffer.tap b/test/test/child-text-sub--buffer.tap
@@ -1,5 +1,5 @@
 TAP version 13
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~child-text-sub.js sub ___/# time=[0-9.]+(ms)?/~~~ {
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~child-text-sub.js sub ___/# time=[0-9.]+(ms)?/~~~ {
     # Subtest: parent
         # Subtest: child
             # Subtest: grandchild

diff --git a/test/test/child-text-sub.tap b/test/test/child-text-sub.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~child-text-sub.js sub
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~child-text-sub.js sub
     # Subtest: parent
         # Subtest: child
             # Subtest: grandchild
@@ -19,7 +19,7 @@ TAP version 13
     1..1
     # failed 1 of 1 tests
     # failed 1 test
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~child-text-sub.js sub ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~child-text-sub.js sub ___/# time=[0-9.]+(ms)?/~~~
 
 1..1
 # failed 1 test

diff --git a/test/test/exit-on-exit--buffer.tap b/test/test/exit-on-exit--buffer.tap
@@ -1,5 +1,5 @@
 TAP version 13
-ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~exit-on-exit.js subtest ___/# time=[0-9.]+(ms)?/~~~ {
+ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~exit-on-exit.js subtest ___/# time=[0-9.]+(ms)?/~~~ {
     ok 1 - memoizes identical registry requests ___/# time=[0-9.]+(ms)?/~~~ {
         1..2
         ok 1 - got a manifest

diff --git a/test/test/exit-on-exit.tap b/test/test/exit-on-exit.tap
@@ -1,5 +1,5 @@
 TAP version 13
-ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~exit-on-exit.js subtest ___/# time=[0-9.]+(ms)?/~~~ {
+ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~exit-on-exit.js subtest ___/# time=[0-9.]+(ms)?/~~~ {
     # Subtest: memoizes identical registry requests
         1..2
         ok 1 - got a manifest

diff --git a/test/test/grep--buffer.tap b/test/test/grep--buffer.tap
@@ -1,5 +1,5 @@
 TAP version 13
-ok 1 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C --grep=nesting --grep=/[ASDF].*d$/gi ___/# time=[0-9.]+(ms)?/~~~ {
+ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C --grep=nesting --grep=/[ASDF].*d$/gi ___/# time=[0-9.]+(ms)?/~~~ {
     ok 1 - ___/.*/~~~ok.js ___/# time=[0-9.]+(ms)?/~~~ {
         ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~ {
             1..2
@@ -27,7 +27,7 @@ ok 1 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C --grep=nes
     ___/# time=[0-9.]+(ms)?/~~~
 }
 
-ok 2 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C -i --grep=nesting --grep=/[ASDF].*d$/gi ___/# time=[0-9.]+(ms)?/~~~ {
+ok 2 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C -i --grep=nesting --grep=/[ASDF].*d$/gi ___/# time=[0-9.]+(ms)?/~~~ {
     ok 1 - ___/.*/~~~ok.js ___/# time=[0-9.]+(ms)?/~~~ {
         ok 1 - nesting # SKIP filter out: /nesting/
         ok 2 - this passes

diff --git a/test/test/grep.tap b/test/test/grep.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C --grep=nesting --grep=/[ASDF].*d$/gi
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C --grep=nesting --grep=/[ASDF].*d$/gi
     # Subtest: ___/.*/~~~ok.js
         # Subtest: nesting
             1..2
@@ -25,9 +25,9 @@ TAP version 13
 
     1..1
     ___/# time=[0-9.]+(ms)?/~~~
-ok 1 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C --grep=nesting --grep=/[ASDF].*d$/gi ___/# time=[0-9.]+(ms)?/~~~
+ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C --grep=nesting --grep=/[ASDF].*d$/gi ___/# time=[0-9.]+(ms)?/~~~
 
-# Subtest: ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C -i --grep=nesting --grep=/[ASDF].*d$/gi
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C -i --grep=nesting --grep=/[ASDF].*d$/gi
     # Subtest: ___/.*/~~~ok.js
         ok 1 - nesting # SKIP filter out: /nesting/
         ok 2 - this passes
@@ -46,7 +46,7 @@ ok 1 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C --grep=nes
 
     1..1
     ___/# time=[0-9.]+(ms)?/~~~
-ok 2 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C -i --grep=nesting --grep=/[ASDF].*d$/gi ___/# time=[0-9.]+(ms)?/~~~
+ok 2 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C -i --grep=nesting --grep=/[ASDF].*d$/gi ___/# time=[0-9.]+(ms)?/~~~
 
 # invert=false
 # Subtest: a

diff --git a/test/test/only--buffer.tap b/test/test/only--buffer.tap
@@ -1,5 +1,5 @@
 TAP version 13
-ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~only.js child ___/# time=[0-9.]+(ms)?/~~~ {
+ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~only.js child ___/# time=[0-9.]+(ms)?/~~~ {
     ok 1 - normal ___/# time=[0-9.]+(ms)?/~~~ {
         ok 1 - this is fine
         1..1
@@ -21,7 +21,7 @@ ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~only.js child ___/# time=[0-9.]+(ms)?/~~~ {
     ___/# time=[0-9.]+(ms)?/~~~
 }
 
-ok 2 - ___/.*(node|iojs)(.exe)?.*/~~~only.js child ___/# time=[0-9.]+(ms)?/~~~ {
+ok 2 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~only.js child ___/# time=[0-9.]+(ms)?/~~~ {
     ok 1 - normal # SKIP filter: only
     # Subtest: only
         ok 1 - only do this
@@ -38,7 +38,7 @@ ok 2 - ___/.*(node|iojs)(.exe)?.*/~~~only.js child ___/# time=[0-9.]+(ms)?/~~~ {
     ___/# time=[0-9.]+(ms)?/~~~
 }
 
-ok 3 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=child ___/# time=[0-9.]+(ms)?/~~~ {
+ok 3 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=child ___/# time=[0-9.]+(ms)?/~~~ {
     # Subtest: ___/.*/~~~only.js
         ok 1 - normal # SKIP filter: only
         # Subtest: only
@@ -60,7 +60,7 @@ ok 3 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=ch
     ___/# time=[0-9.]+(ms)?/~~~
 }
 
-ok 4 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=child --only ___/# time=[0-9.]+(ms)?/~~~ {
+ok 4 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=child --only ___/# time=[0-9.]+(ms)?/~~~ {
     ok 1 - ___/.*/~~~only.js ___/# time=[0-9.]+(ms)?/~~~ {
         ok 1 - normal # SKIP filter: only
         ok 2 - only ___/# time=[0-9.]+(ms)?/~~~ {
@@ -82,7 +82,7 @@ ok 4 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=ch
     ___/# time=[0-9.]+(ms)?/~~~
 }
 
-ok 5 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=child -O ___/# time=[0-9.]+(ms)?/~~~ {
+ok 5 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=child -O ___/# time=[0-9.]+(ms)?/~~~ {
     ok 1 - ___/.*/~~~only.js ___/# time=[0-9.]+(ms)?/~~~ {
         ok 1 - normal # SKIP filter: only
         ok 2 - only ___/# time=[0-9.]+(ms)?/~~~ {

diff --git a/test/test/only.tap b/test/test/only.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~only.js child
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~only.js child
     # Subtest: normal
         ok 1 - this is fine
         1..1
@@ -19,9 +19,9 @@ TAP version 13
 
     1..3
     ___/# time=[0-9.]+(ms)?/~~~
-ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~only.js child ___/# time=[0-9.]+(ms)?/~~~
+ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~only.js child ___/# time=[0-9.]+(ms)?/~~~
 
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~only.js child
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~only.js child
     ok 1 - normal # SKIP filter: only
     # Subtest: only
         ok 1 - only do this
@@ -36,9 +36,9 @@ ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~only.js child ___/# time=[0-9.]+(ms)?/~~~
     1..3
     # skip: 1
     ___/# time=[0-9.]+(ms)?/~~~
-ok 2 - ___/.*(node|iojs)(.exe)?.*/~~~only.js child ___/# time=[0-9.]+(ms)?/~~~
+ok 2 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~only.js child ___/# time=[0-9.]+(ms)?/~~~
 
-# Subtest: ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=child
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=child
     # Subtest: ___/.*/~~~only.js
         ok 1 - normal # SKIP filter: only
         # Subtest: only
@@ -58,9 +58,9 @@ ok 2 - ___/.*(node|iojs)(.exe)?.*/~~~only.js child ___/# time=[0-9.]+(ms)?/~~~
 
     1..1
     ___/# time=[0-9.]+(ms)?/~~~
-ok 3 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=child ___/# time=[0-9.]+(ms)?/~~~
+ok 3 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=child ___/# time=[0-9.]+(ms)?/~~~
 
-# Subtest: ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=child --only
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=child --only
     # Subtest: ___/.*/~~~only.js
         ok 1 - normal # SKIP filter: only
         # Subtest: only
@@ -80,9 +80,9 @@ ok 3 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=ch
 
     1..1
     ___/# time=[0-9.]+(ms)?/~~~
-ok 4 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=child --only ___/# time=[0-9.]+(ms)?/~~~
+ok 4 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=child --only ___/# time=[0-9.]+(ms)?/~~~
 
-# Subtest: ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=child -O
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=child -O
     # Subtest: ___/.*/~~~only.js
         ok 1 - normal # SKIP filter: only
         # Subtest: only
@@ -102,7 +102,7 @@ ok 4 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=ch
 
     1..1
     ___/# time=[0-9.]+(ms)?/~~~
-ok 5 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=child -O ___/# time=[0-9.]+(ms)?/~~~
+ok 5 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./bin/run.js ___/.*/~~~only.js --test-arg=child -O ___/# time=[0-9.]+(ms)?/~~~
 
 1..5
 ___/# time=[0-9.]+(ms)?/~~~

diff --git a/test/test/pending-handles--bail--buffer.tap b/test/test/pending-handles--bail--buffer.tap
@@ -1,7 +1,7 @@
 TAP version 13
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~pending-handles.js child ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~pending-handles.js child ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"args":["___/.*/~~~pending-handles.js","child"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1,"timeout":900}
+  {"args":["___/.*/~~~pending-handles.js","child"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1,"timeout":900}
   ...
 {
     ok 1 - this is ok

diff --git a/test/test/pending-handles--bail.tap b/test/test/pending-handles--bail.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~pending-handles.js child
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~pending-handles.js child
     ok 1 - this is ok
     not ok 2 - timeout!
       ---

diff --git a/test/test/pending-handles--buffer.tap b/test/test/pending-handles--buffer.tap
@@ -1,7 +1,7 @@
 TAP version 13
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~pending-handles.js child ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~pending-handles.js child ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"args":["___/.*/~~~pending-handles.js","child"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":null,"signal":"SIGTERM","timeout":900}
+  {"args":["___/.*/~~~pending-handles.js","child"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":null,"signal":"SIGTERM","timeout":900}
   ...
 {
     ok 1 - this is ok

diff --git a/test/test/pending-handles.tap b/test/test/pending-handles.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~pending-handles.js child
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~pending-handles.js child
     ok 1 - this is ok
     not ok 2 - timeout!
       ---
@@ -9,9 +9,9 @@ TAP version 13
     1..2
     # failed 1 of 2 tests
     ___/# time=[0-9.]+(ms)?/~~~
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~pending-handles.js child ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~pending-handles.js child ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"args":["___/.*/~~~pending-handles.js","child"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":null,"signal":"SIGTERM","timeout":900}
+  {"args":["___/.*/~~~pending-handles.js","child"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":null,"signal":"SIGTERM","timeout":900}
   ...
 
 1..1

diff --git a/test/test/pragma--bail--buffer.tap b/test/test/pragma--bail--buffer.tap
@@ -1,8 +1,8 @@
 TAP version 13
 pragma +child
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~pragma.js child ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~pragma.js child ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"args":["___/.*/~~~pragma.js","child"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":0,"failures":[{"data":"this is not tap and it is not ok\n","tapError":"Non-TAP data encountered in strict mode"}]}
+  {"args":["___/.*/~~~pragma.js","child"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":0,"failures":[{"data":"this is not tap and it is not ok\n","tapError":"Non-TAP data encountered in strict mode"}]}
   ...
 {
     this is not tap but it is ok
@@ -16,5 +16,5 @@ not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~pragma.js child ___/# time=[0-9.]+(ms)?
     ___/# time=[0-9.]+(ms)?/~~~
     # failed 1 of 2 tests
 }
-Bail out! # ___/.*(node|iojs)(.exe)?.*/~~~pragma.js child
+Bail out! # ___/.*(node(js)?|iojs)(.exe)?.*/~~~pragma.js child