[Pkg-javascript-commits] [node-tap] 02/186: node can be called nodejs

Bastien Roucariès rouca at moszumanska.debian.org
Fri Dec 1 16:40:38 UTC 2017


This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-tap.

commit 067dc57ffbf392a58b833145b96ba4ddfa973cea
Author: isaacs <i at izs.me>
Date:   Mon Sep 4 18:10:06 2017 -0700

    node can be called nodejs
    
    Fix #402
---
 scripts/generate-test-test.js                        |  4 ++--
 test/runner-test-args.js                             |  2 +-
 test/test/bail-fail-spawn--bail--buffer.tap          |  4 ++--
 test/test/bail-fail-spawn--bail.tap                  |  2 +-
 test/test/bail-fail-spawn--buffer.tap                |  4 ++--
 test/test/bail-fail-spawn.tap                        |  2 +-
 test/test/child-text-buffer--bail--buffer.tap        |  2 +-
 test/test/child-text-buffer--bail.tap                |  2 +-
 test/test/child-text-buffer--buffer.tap              |  2 +-
 test/test/child-text-buffer.tap                      |  4 ++--
 test/test/child-text-indentsub--bail--buffer.tap     |  2 +-
 test/test/child-text-indentsub--bail.tap             |  2 +-
 test/test/child-text-indentsub--buffer.tap           |  2 +-
 test/test/child-text-indentsub.tap                   |  4 ++--
 test/test/child-text-sub--bail--buffer.tap           |  2 +-
 test/test/child-text-sub--bail.tap                   |  2 +-
 test/test/child-text-sub--buffer.tap                 |  2 +-
 test/test/child-text-sub.tap                         |  4 ++--
 test/test/exit-on-exit--buffer.tap                   |  2 +-
 test/test/exit-on-exit.tap                           |  2 +-
 test/test/grep--buffer.tap                           |  4 ++--
 test/test/grep.tap                                   |  8 ++++----
 test/test/only--buffer.tap                           | 10 +++++-----
 test/test/only.tap                                   | 20 ++++++++++----------
 test/test/pending-handles--bail--buffer.tap          |  4 ++--
 test/test/pending-handles--bail.tap                  |  2 +-
 test/test/pending-handles--buffer.tap                |  4 ++--
 test/test/pending-handles.tap                        |  6 +++---
 test/test/pragma--bail--buffer.tap                   |  6 +++---
 test/test/pragma--bail.tap                           |  8 ++++----
 test/test/pragma--buffer.tap                         |  8 ++++----
 test/test/pragma.tap                                 |  8 ++++----
 test/test/promise--buffer.tap                        |  2 +-
 test/test/promise.tap                                |  4 ++--
 test/test/spawn--bail--buffer.tap                    |  4 ++--
 test/test/spawn--bail.tap                            |  2 +-
 test/test/spawn--buffer.tap                          |  4 ++--
 test/test/spawn-empty--buffer.tap                    |  2 +-
 test/test/spawn-empty.tap                            |  4 ++--
 test/test/spawn-failures--bail--buffer.tap           |  6 +++---
 test/test/spawn-failures--bail.tap                   |  4 ++--
 test/test/spawn-failures--buffer.tap                 | 12 ++++++------
 test/test/spawn-failures.tap                         | 16 ++++++++--------
 test/test/spawn-stderr--buffer.tap                   |  2 +-
 test/test/spawn-stderr.tap                           |  4 ++--
 test/test/spawn.tap                                  |  6 +++---
 test/test/timeout-via-runner--bail--buffer.tap       |  4 ++--
 test/test/timeout-via-runner--bail.tap               |  2 +-
 test/test/timeout-via-runner--buffer.tap             |  4 ++--
 ...meout-via-runner-ignore-sigterm--bail--buffer.tap |  6 +++---
 .../test/timeout-via-runner-ignore-sigterm--bail.tap |  4 ++--
 .../timeout-via-runner-ignore-sigterm--buffer.tap    |  6 +++---
 test/test/timeout-via-runner-ignore-sigterm.tap      |  8 ++++----
 .../timeout-via-runner-no-plan--bail--buffer.tap     |  4 ++--
 test/test/timeout-via-runner-no-plan--bail.tap       |  2 +-
 test/test/timeout-via-runner-no-plan--buffer.tap     |  4 ++--
 test/test/timeout-via-runner-no-plan.tap             |  6 +++---
 test/test/timeout-via-runner.tap                     |  6 +++---
 test/test/unfinished--buffer.tap                     |  2 +-
 test/test/unfinished.tap                             |  2 +-
 60 files changed, 136 insertions(+), 136 deletions(-)

diff --git a/scripts/generate-test-test.js b/scripts/generate-test-test.js
index 79aec8f..3086c36 100644
--- 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
index 052cc72..4b09a70 100644
--- 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
index 5bbb59b..cba16e0 100644
--- 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
index 6f1d943..804b139 100644
--- 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
index 5bbb59b..cba16e0 100644
--- 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
index 6f1d943..804b139 100644
--- 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
index 565029e..7a01749 100644
--- 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
index 1750633..2a9d73b 100644
--- 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
index 7b17541..7770764 100644
--- 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
index 80beee3..1367d2c 100644
--- 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
index a7e3aa5..0df9be7 100644
--- 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
index 249c663..ad90b58 100644
--- 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
index d3781bc..cef8212 100644
--- 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
index 3f9e20c..7866adf 100644
--- 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
index a9422b7..d52b9b2 100644
--- 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
index be92818..3411d83 100644
--- 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
index 31c4299..18080e9 100644
--- 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
index e901b7d..a188658 100644
--- 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
index 3098c30..1825d77 100644
--- 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
index 124a0f5..e39a799 100644
--- 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
index ca2f5f4..42e5340 100644
--- 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
index 9bfc09c..0988809 100644
--- 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
index e053f12..77584a7 100644
--- 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
index 86b697b..0e96bce 100644
--- 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
index fb9fd9d..acab416 100644
--- 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
index bf59a3b..b2b299b 100644
--- 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
index 7f51749..8919628 100644
--- 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
index d1b5354..8b52122 100644
--- 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
index 1468526..5c15427 100644
--- 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
 
diff --git a/test/test/pragma--bail.tap b/test/test/pragma--bail.tap
index d846595..04f9716 100644
--- a/test/test/pragma--bail.tap
+++ b/test/test/pragma--bail.tap
@@ -1,6 +1,6 @@
 TAP version 13
 pragma +child
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~pragma.js child
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~pragma.js child
     this is not tap but it is ok
     ok 1 - an ok test
     pragma +strict
@@ -11,10 +11,10 @@ pragma +child
     1..2
     ___/# time=[0-9.]+(ms)?/~~~
     # failed 1 of 2 tests
-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"}]}
   ...
 
-Bail out! # ___/.*(node|iojs)(.exe)?.*/~~~pragma.js child
+Bail out! # ___/.*(node(js)?|iojs)(.exe)?.*/~~~pragma.js child
 
diff --git a/test/test/pragma--buffer.tap b/test/test/pragma--buffer.tap
index 47342b5..b289279 100644
--- a/test/test/pragma--buffer.tap
+++ b/test/test/pragma--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
@@ -18,9 +18,9 @@ not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~pragma.js child ___/# time=[0-9.]+(ms)?
 }
 
 pragma -child
-not ok 2 - ___/.*(node|iojs)(.exe)?.*/~~~pragma.js child bailout ___/# time=[0-9.]+(ms)?/~~~
+not ok 2 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~pragma.js child bailout ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"args":["___/.*/~~~pragma.js","child","bailout"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1}
+  {"args":["___/.*/~~~pragma.js","child","bailout"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1}
   ...
 {
     Bail out! no pragmas come after bailout
diff --git a/test/test/pragma.tap b/test/test/pragma.tap
index 1a36fcc..25af9d5 100644
--- a/test/test/pragma.tap
+++ b/test/test/pragma.tap
@@ -1,6 +1,6 @@
 TAP version 13
 pragma +child
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~pragma.js child
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~pragma.js child
     this is not tap but it is ok
     ok 1 - an ok test
     pragma +strict
@@ -11,13 +11,13 @@ pragma +child
     1..2
     ___/# time=[0-9.]+(ms)?/~~~
     # failed 1 of 2 tests
-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"}]}
   ...
 
 pragma -child
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~pragma.js child bailout
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~pragma.js child bailout
     Bail out! no pragmas come after bailout
 Bail out! no pragmas come after bailout
 
diff --git a/test/test/promise--buffer.tap b/test/test/promise--buffer.tap
index f74d8d1..5d8bdfb 100644
--- a/test/test/promise--buffer.tap
+++ b/test/test/promise--buffer.tap
@@ -29,7 +29,7 @@ ok 3 - some_function_name ___/# time=[0-9.]+(ms)?/~~~ {
     1..1
 }
 
-ok 4 - ___/.*(node|iojs)(.exe)?.*/~~~promise.js child ___/# time=[0-9.]+(ms)?/~~~ {
+ok 4 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~promise.js child ___/# time=[0-9.]+(ms)?/~~~ {
     ok 1 - one ___/# time=[0-9.]+(ms)?/~~~ {
         ok 1 - two ___/# time=[0-9.]+(ms)?/~~~ {
             ok 1 - child of 2 ___/# time=[0-9.]+(ms)?/~~~ {
diff --git a/test/test/promise.tap b/test/test/promise.tap
index be8df13..cf1c8d5 100644
--- a/test/test/promise.tap
+++ b/test/test/promise.tap
@@ -29,7 +29,7 @@ ok 2 - three ___/# time=[0-9.]+(ms)?/~~~
     1..1
 ok 3 - some_function_name ___/# time=[0-9.]+(ms)?/~~~
 
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~promise.js child
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~promise.js child
     # Subtest: one
         # Subtest: two
             # Subtest: child of 2
@@ -70,7 +70,7 @@ ok 3 - some_function_name ___/# time=[0-9.]+(ms)?/~~~
     ok 7 - this is fine
     1..7
     ___/# time=[0-9.]+(ms)?/~~~
-ok 4 - ___/.*(node|iojs)(.exe)?.*/~~~promise.js child ___/# time=[0-9.]+(ms)?/~~~
+ok 4 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~promise.js child ___/# time=[0-9.]+(ms)?/~~~
 
 ok 5 - is root tap test
 ok 6 - has no parent
diff --git a/test/test/spawn--bail--buffer.tap b/test/test/spawn--bail--buffer.tap
index ecc518a..b63b7a6 100644
--- a/test/test/spawn--bail--buffer.tap
+++ b/test/test/spawn--bail--buffer.tap
@@ -1,7 +1,7 @@
 TAP version 13
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~spawn.js child ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~spawn.js child ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"args":["___/.*/~~~spawn.js","child"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1}
+  {"args":["___/.*/~~~spawn.js","child"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1}
   ...
 {
     not ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~ {
diff --git a/test/test/spawn--bail.tap b/test/test/spawn--bail.tap
index e005699..750d42e 100644
--- a/test/test/spawn--bail.tap
+++ b/test/test/spawn--bail.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~spawn.js child
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~spawn.js child
     # Subtest: nesting
         1..2
         # Subtest: first
diff --git a/test/test/spawn--buffer.tap b/test/test/spawn--buffer.tap
index 1fec787..c37c711 100644
--- a/test/test/spawn--buffer.tap
+++ b/test/test/spawn--buffer.tap
@@ -1,7 +1,7 @@
 TAP version 13
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~spawn.js child ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~spawn.js child ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"args":["___/.*/~~~spawn.js","child"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1}
+  {"args":["___/.*/~~~spawn.js","child"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1}
   ...
 {
     not ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~ {
diff --git a/test/test/spawn-empty--buffer.tap b/test/test/spawn-empty--buffer.tap
index 31c6fea..40dd1cc 100644
--- a/test/test/spawn-empty--buffer.tap
+++ b/test/test/spawn-empty--buffer.tap
@@ -1,5 +1,5 @@
 TAP version 13
-ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~spawn-empty.js child # SKIP no tests found {
+ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~spawn-empty.js child # SKIP no tests found {
     1..0 # no tests found
 }
 
diff --git a/test/test/spawn-empty.tap b/test/test/spawn-empty.tap
index 965d56f..2c4efcf 100644
--- a/test/test/spawn-empty.tap
+++ b/test/test/spawn-empty.tap
@@ -1,7 +1,7 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~spawn-empty.js child
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~spawn-empty.js child
     1..0 # no tests found
-ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~spawn-empty.js child # SKIP no tests found
+ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~spawn-empty.js child # SKIP no tests found
 
 1..1
 # skip: 1
diff --git a/test/test/spawn-failures--bail--buffer.tap b/test/test/spawn-failures--bail--buffer.tap
index 4c092f3..df0141b 100644
--- a/test/test/spawn-failures--bail--buffer.tap
+++ b/test/test/spawn-failures--bail--buffer.tap
@@ -1,14 +1,14 @@
 TAP version 13
 not ok 1 - spawn that throws ___/# time=[0-9.]+(ms)?/~~~ {
-    not ok 1 - ___/.*(node|iojs)(.exe)?/~~~ ./test/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
+    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
       ---
-      {"args":["___/.*/~~~ok.js"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~"}
+      {"args":["___/.*/~~~ok.js"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~"}
       ...
     {
         
         not ok 1 - now is fine
           ---
-          {"args":["___/.*/~~~ok.js"],"at":{"column":14,"file":"test/test/spawn-failures.js","line":25},"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwNow = new Error('now is fine')\n","test":"___/.*(node|iojs)(.exe)?/~~~ ./test/test/ok.js"}
+          {"args":["___/.*/~~~ok.js"],"at":{"column":14,"file":"test/test/spawn-failures.js","line":25},"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwNow = new Error('now is fine')\n","test":"___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js"}
           ...
         Bail out! # now is fine
     }
diff --git a/test/test/spawn-failures--bail.tap b/test/test/spawn-failures--bail.tap
index c911490..3cc7d06 100644
--- a/test/test/spawn-failures--bail.tap
+++ b/test/test/spawn-failures--bail.tap
@@ -1,10 +1,10 @@
 TAP version 13
 # Subtest: spawn that throws
-    # Subtest: ___/.*(node|iojs)(.exe)?/~~~ ./test/test/ok.js
+    # Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js
         
         not ok 1 - now is fine
           ---
-          {"args":["___/.*/~~~ok.js"],"at":{"column":14,"file":"test/test/spawn-failures.js","line":25},"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwNow = new Error('now is fine')\n","test":"___/.*(node|iojs)(.exe)?/~~~ ./test/test/ok.js"}
+          {"args":["___/.*/~~~ok.js"],"at":{"column":14,"file":"test/test/spawn-failures.js","line":25},"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwNow = new Error('now is fine')\n","test":"___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js"}
           ...
         Bail out! # now is fine
 Bail out! # now is fine
diff --git a/test/test/spawn-failures--buffer.tap b/test/test/spawn-failures--buffer.tap
index 7caa2fe..78d8fab 100644
--- a/test/test/spawn-failures--buffer.tap
+++ b/test/test/spawn-failures--buffer.tap
@@ -1,14 +1,14 @@
 TAP version 13
 not ok 1 - spawn that throws ___/# time=[0-9.]+(ms)?/~~~ {
-    not ok 1 - ___/.*(node|iojs)(.exe)?/~~~ ./test/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
+    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
       ---
-      {"args":["___/.*/~~~ok.js"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~"}
+      {"args":["___/.*/~~~ok.js"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~"}
       ...
     {
         
         not ok 1 - now is fine
           ---
-          {"args":["___/.*/~~~ok.js"],"at":{"column":14,"file":"test/test/spawn-failures.js","line":25},"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwNow = new Error('now is fine')\n","test":"___/.*(node|iojs)(.exe)?/~~~ ./test/test/ok.js"}
+          {"args":["___/.*/~~~ok.js"],"at":{"column":14,"file":"test/test/spawn-failures.js","line":25},"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwNow = new Error('now is fine')\n","test":"___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js"}
           ...
         1..1
         # failed 1 test
@@ -19,15 +19,15 @@ not ok 1 - spawn that throws ___/# time=[0-9.]+(ms)?/~~~ {
 }
 
 not ok 2 - spawn that throws ___/# time=[0-9.]+(ms)?/~~~ {
-    not ok 1 - ___/.*(node|iojs)(.exe)?/~~~ ./test/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
+    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
       ---
-      {"args":["___/.*/~~~ok.js"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~"}
+      {"args":["___/.*/~~~ok.js"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~"}
       ...
     {
         
         not ok 1 - later is fine
           ---
-          {"args":["___/.*/~~~ok.js"],"at":{"column":16,"file":"test/test/spawn-failures.js","line":34},"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwLater = new Error('later is fine')\n","test":"___/.*(node|iojs)(.exe)?/~~~ ./test/test/ok.js"}
+          {"args":["___/.*/~~~ok.js"],"at":{"column":16,"file":"test/test/spawn-failures.js","line":34},"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwLater = new Error('later is fine')\n","test":"___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js"}
           ...
         1..1
         # failed 1 test
diff --git a/test/test/spawn-failures.tap b/test/test/spawn-failures.tap
index 968a151..65ffb3b 100644
--- a/test/test/spawn-failures.tap
+++ b/test/test/spawn-failures.tap
@@ -1,16 +1,16 @@
 TAP version 13
 # Subtest: spawn that throws
-    # Subtest: ___/.*(node|iojs)(.exe)?/~~~ ./test/test/ok.js
+    # Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js
         
         not ok 1 - now is fine
           ---
-          {"args":["___/.*/~~~ok.js"],"at":{"column":14,"file":"test/test/spawn-failures.js","line":25},"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwNow = new Error('now is fine')\n","test":"___/.*(node|iojs)(.exe)?/~~~ ./test/test/ok.js"}
+          {"args":["___/.*/~~~ok.js"],"at":{"column":14,"file":"test/test/spawn-failures.js","line":25},"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwNow = new Error('now is fine')\n","test":"___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js"}
           ...
         1..1
         # failed 1 test
-    not ok 1 - ___/.*(node|iojs)(.exe)?/~~~ ./test/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
+    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
       ---
-      {"args":["___/.*/~~~ok.js"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~"}
+      {"args":["___/.*/~~~ok.js"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~"}
       ...
     
     1..1
@@ -18,17 +18,17 @@ TAP version 13
 not ok 1 - spawn that throws ___/# time=[0-9.]+(ms)?/~~~
 
 # Subtest: spawn that throws
-    # Subtest: ___/.*(node|iojs)(.exe)?/~~~ ./test/test/ok.js
+    # Subtest: ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js
         
         not ok 1 - later is fine
           ---
-          {"args":["___/.*/~~~ok.js"],"at":{"column":16,"file":"test/test/spawn-failures.js","line":34},"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwLater = new Error('later is fine')\n","test":"___/.*(node|iojs)(.exe)?/~~~ ./test/test/ok.js"}
+          {"args":["___/.*/~~~ok.js"],"at":{"column":16,"file":"test/test/spawn-failures.js","line":34},"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","source":"throwLater = new Error('later is fine')\n","test":"___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js"}
           ...
         1..1
         # failed 1 test
-    not ok 1 - ___/.*(node|iojs)(.exe)?/~~~ ./test/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
+    not ok 1 - ___/.*(node(js)?|iojs)(.exe)?/~~~ ./test/test/ok.js ___/# time=[0-9.]+(ms)?/~~~
       ---
-      {"args":["___/.*/~~~ok.js"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~"}
+      {"args":["___/.*/~~~ok.js"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~"}
       ...
     
     1..1
diff --git a/test/test/spawn-stderr--buffer.tap b/test/test/spawn-stderr--buffer.tap
index 8cd8d48..fad0dd5 100644
--- a/test/test/spawn-stderr--buffer.tap
+++ b/test/test/spawn-stderr--buffer.tap
@@ -1,5 +1,5 @@
 TAP version 13
-ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~spawn-stderr.js child ___/# time=[0-9.]+(ms)?/~~~ {
+ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~spawn-stderr.js child ___/# time=[0-9.]+(ms)?/~~~ {
     stdout
     ok 1 - this is ok
     1..1
diff --git a/test/test/spawn-stderr.tap b/test/test/spawn-stderr.tap
index 38f4820..594c5d8 100644
--- a/test/test/spawn-stderr.tap
+++ b/test/test/spawn-stderr.tap
@@ -1,10 +1,10 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~spawn-stderr.js child
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~spawn-stderr.js child
     stdout
     ok 1 - this is ok
     1..1
     ___/# time=[0-9.]+(ms)?/~~~
-ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~spawn-stderr.js child ___/# time=[0-9.]+(ms)?/~~~
+ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~spawn-stderr.js child ___/# time=[0-9.]+(ms)?/~~~
 
 1..1
 ___/# time=[0-9.]+(ms)?/~~~
diff --git a/test/test/spawn.tap b/test/test/spawn.tap
index 481ccaf..9660603 100644
--- a/test/test/spawn.tap
+++ b/test/test/spawn.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~spawn.js child
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~spawn.js child
     # Subtest: nesting
         1..2
         # Subtest: first
@@ -44,9 +44,9 @@ TAP version 13
     1..5
     # failed 3 of 5 tests
     ___/# time=[0-9.]+(ms)?/~~~
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~spawn.js child ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~spawn.js child ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"args":["___/.*/~~~spawn.js","child"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1}
+  {"args":["___/.*/~~~spawn.js","child"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1}
   ...
 
 # Subtest: nesting
diff --git a/test/test/timeout-via-runner--bail--buffer.tap b/test/test/timeout-via-runner--bail--buffer.tap
index 26ff22d..9069ce5 100644
--- a/test/test/timeout-via-runner--bail--buffer.tap
+++ b/test/test/timeout-via-runner--bail--buffer.tap
@@ -1,7 +1,7 @@
 TAP version 13
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner.js child ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner.js child ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"args":["___/.*/~~~timeout-via-runner.js","child"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1,"timeout":1000}
+  {"args":["___/.*/~~~timeout-via-runner.js","child"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1,"timeout":1000}
   ...
 {
     ok 1 - this is fine 1
diff --git a/test/test/timeout-via-runner--bail.tap b/test/test/timeout-via-runner--bail.tap
index 56fea48..b5281f7 100644
--- a/test/test/timeout-via-runner--bail.tap
+++ b/test/test/timeout-via-runner--bail.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner.js child
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner.js child
     ok 1 - this is fine 1
     ok 2 - this is fine 2
     ok 3 - this is fine 3
diff --git a/test/test/timeout-via-runner--buffer.tap b/test/test/timeout-via-runner--buffer.tap
index fb4e84e..5a009ce 100644
--- a/test/test/timeout-via-runner--buffer.tap
+++ b/test/test/timeout-via-runner--buffer.tap
@@ -1,7 +1,7 @@
 TAP version 13
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner.js child ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner.js child ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"args":["___/.*/~~~timeout-via-runner.js","child"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":null,"signal":"SIGTERM","timeout":1000}
+  {"args":["___/.*/~~~timeout-via-runner.js","child"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":null,"signal":"SIGTERM","timeout":1000}
   ...
 {
     ok 1 - this is fine 1
diff --git a/test/test/timeout-via-runner-ignore-sigterm--bail--buffer.tap b/test/test/timeout-via-runner-ignore-sigterm--bail--buffer.tap
index 6092cbf..b0b0a20 100644
--- a/test/test/timeout-via-runner-ignore-sigterm--bail--buffer.tap
+++ b/test/test/timeout-via-runner-ignore-sigterm--bail--buffer.tap
@@ -1,7 +1,7 @@
 TAP version 13
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js child ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js child ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"args":["___/.*/~~~timeout-via-runner-ignore-sigterm.js","child"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","timeout":1000}
+  {"args":["___/.*/~~~timeout-via-runner-ignore-sigterm.js","child"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","timeout":1000}
   ...
 {
     ok 1 - this is fine 1
@@ -11,7 +11,7 @@ not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js ch
     yolo
     not ok 4 - timeout!
       ---
-      {"expired":"___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js child"}
+      {"expired":"___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js child"}
       ...
     Bail out! # timeout!
 }
diff --git a/test/test/timeout-via-runner-ignore-sigterm--bail.tap b/test/test/timeout-via-runner-ignore-sigterm--bail.tap
index a4695b1..fead00e 100644
--- a/test/test/timeout-via-runner-ignore-sigterm--bail.tap
+++ b/test/test/timeout-via-runner-ignore-sigterm--bail.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js child
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js child
     ok 1 - this is fine 1
     ok 2 - this is fine 2
     ok 3 - this is fine 3
@@ -11,7 +11,7 @@ TAP version 13
         
         not ok 3 - timeout!
           ---
-          {"expired":"___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js child"}
+          {"expired":"___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js child"}
           ...
         # failed 1 of 3 tests
         Bail out! # timeout!
diff --git a/test/test/timeout-via-runner-ignore-sigterm--buffer.tap b/test/test/timeout-via-runner-ignore-sigterm--buffer.tap
index 2408c0d..5685820 100644
--- a/test/test/timeout-via-runner-ignore-sigterm--buffer.tap
+++ b/test/test/timeout-via-runner-ignore-sigterm--buffer.tap
@@ -1,7 +1,7 @@
 TAP version 13
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js child ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js child ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"args":["___/.*/~~~timeout-via-runner-ignore-sigterm.js","child"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","timeout":1000}
+  {"args":["___/.*/~~~timeout-via-runner-ignore-sigterm.js","child"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","timeout":1000}
   ...
 {
     ok 1 - this is fine 1
@@ -11,7 +11,7 @@ not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js ch
     yolo
     not ok 4 - timeout!
       ---
-      {"expired":"___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js child"}
+      {"expired":"___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js child"}
       ...
     1..4
     # failed 1 of 4 tests
diff --git a/test/test/timeout-via-runner-ignore-sigterm.tap b/test/test/timeout-via-runner-ignore-sigterm.tap
index 3636e1f..ff22fa9 100644
--- a/test/test/timeout-via-runner-ignore-sigterm.tap
+++ b/test/test/timeout-via-runner-ignore-sigterm.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js child
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js child
     ok 1 - this is fine 1
     ok 2 - this is fine 2
     ok 3 - this is fine 3
@@ -11,16 +11,16 @@ TAP version 13
         
         not ok 3 - timeout!
           ---
-          {"expired":"___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js child"}
+          {"expired":"___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js child"}
           ...
         # failed 1 of 3 tests
     not ok 4 - timeout!
     
     1..4
     # failed 1 of 4 tests
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js child ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner-ignore-sigterm.js child ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"args":["___/.*/~~~timeout-via-runner-ignore-sigterm.js","child"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","timeout":1000}
+  {"args":["___/.*/~~~timeout-via-runner-ignore-sigterm.js","child"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","timeout":1000}
   ...
 
 1..1
diff --git a/test/test/timeout-via-runner-no-plan--bail--buffer.tap b/test/test/timeout-via-runner-no-plan--bail--buffer.tap
index 67bf681..2a59bc4 100644
--- a/test/test/timeout-via-runner-no-plan--bail--buffer.tap
+++ b/test/test/timeout-via-runner-no-plan--bail--buffer.tap
@@ -1,7 +1,7 @@
 TAP version 13
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner-no-plan.js child ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner-no-plan.js child ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"args":["___/.*/~~~timeout-via-runner-no-plan.js","child"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1,"timeout":1000}
+  {"args":["___/.*/~~~timeout-via-runner-no-plan.js","child"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":1,"timeout":1000}
   ...
 {
     ok 1 - this is fine 1
diff --git a/test/test/timeout-via-runner-no-plan--bail.tap b/test/test/timeout-via-runner-no-plan--bail.tap
index 3d354b8..be54fe7 100644
--- a/test/test/timeout-via-runner-no-plan--bail.tap
+++ b/test/test/timeout-via-runner-no-plan--bail.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner-no-plan.js child
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner-no-plan.js child
     ok 1 - this is fine 1
     ok 2 - this is fine 2
     ok 3 - this is fine 3
diff --git a/test/test/timeout-via-runner-no-plan--buffer.tap b/test/test/timeout-via-runner-no-plan--buffer.tap
index 6c7d0e2..969b61e 100644
--- a/test/test/timeout-via-runner-no-plan--buffer.tap
+++ b/test/test/timeout-via-runner-no-plan--buffer.tap
@@ -1,7 +1,7 @@
 TAP version 13
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner-no-plan.js child ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner-no-plan.js child ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"args":["___/.*/~~~timeout-via-runner-no-plan.js","child"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":null,"signal":"SIGTERM","timeout":1000}
+  {"args":["___/.*/~~~timeout-via-runner-no-plan.js","child"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":null,"signal":"SIGTERM","timeout":1000}
   ...
 {
     ok 1 - this is fine 1
diff --git a/test/test/timeout-via-runner-no-plan.tap b/test/test/timeout-via-runner-no-plan.tap
index 34fc84c..5c333cf 100644
--- a/test/test/timeout-via-runner-no-plan.tap
+++ b/test/test/timeout-via-runner-no-plan.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner-no-plan.js child
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner-no-plan.js child
     ok 1 - this is fine 1
     ok 2 - this is fine 2
     ok 3 - this is fine 3
@@ -18,9 +18,9 @@ TAP version 13
     1..4
     # failed 1 of 4 tests
     ___/# time=[0-9.]+(ms)?/~~~
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner-no-plan.js child ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner-no-plan.js child ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"args":["___/.*/~~~timeout-via-runner-no-plan.js","child"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":null,"signal":"SIGTERM","timeout":1000}
+  {"args":["___/.*/~~~timeout-via-runner-no-plan.js","child"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":null,"signal":"SIGTERM","timeout":1000}
   ...
 
 1..1
diff --git a/test/test/timeout-via-runner.tap b/test/test/timeout-via-runner.tap
index 91cbdaa..2c48bfa 100644
--- a/test/test/timeout-via-runner.tap
+++ b/test/test/timeout-via-runner.tap
@@ -1,5 +1,5 @@
 TAP version 13
-# Subtest: ___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner.js child
+# Subtest: ___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner.js child
     ok 1 - this is fine 1
     ok 2 - this is fine 2
     ok 3 - this is fine 3
@@ -18,9 +18,9 @@ TAP version 13
     1..4
     # failed 1 of 4 tests
     ___/# time=[0-9.]+(ms)?/~~~
-not ok 1 - ___/.*(node|iojs)(.exe)?.*/~~~timeout-via-runner.js child ___/# time=[0-9.]+(ms)?/~~~
+not ok 1 - ___/.*(node(js)?|iojs)(.exe)?.*/~~~timeout-via-runner.js child ___/# time=[0-9.]+(ms)?/~~~
   ---
-  {"args":["___/.*/~~~timeout-via-runner.js","child"],"command":"___/.*(node|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":null,"signal":"SIGTERM","timeout":1000}
+  {"args":["___/.*/~~~timeout-via-runner.js","child"],"command":"___/.*(node(js)?|iojs)(.exe)?/~~~","cwd":"___/.*/~~~","exitCode":null,"signal":"SIGTERM","timeout":1000}
   ...
 
 1..1
diff --git a/test/test/unfinished--buffer.tap b/test/test/unfinished--buffer.tap
index 8ffeba5..02313c9 100644
--- a/test/test/unfinished--buffer.tap
+++ b/test/test/unfinished--buffer.tap
@@ -23,7 +23,7 @@ not ok 4 - failsome
   ...
 
 not ok 5 - child test left in queue Spawn: spawny
-not ok 6 - child test left in queue Spawn: ___/.*(node|iojs)(.exe)?/~~~ --version
+not ok 6 - child test left in queue Spawn: ___/.*(node(js)?|iojs)(.exe)?/~~~ --version
 not ok 7 - child test left in queue Test: (unnamed test)
 not ok 8 - child test left in queue Test: (unnamed test)
 not ok 9 - child test left in queue Test: t2
diff --git a/test/test/unfinished.tap b/test/test/unfinished.tap
index 0f2fffc..863e176 100644
--- a/test/test/unfinished.tap
+++ b/test/test/unfinished.tap
@@ -23,7 +23,7 @@ not ok 4 - failsome
   ...
 
 not ok 5 - child test left in queue Spawn: spawny
-not ok 6 - child test left in queue Spawn: ___/.*(node|iojs)(.exe)?/~~~ --version
+not ok 6 - child test left in queue Spawn: ___/.*(node(js)?|iojs)(.exe)?/~~~ --version
 not ok 7 - child test left in queue Test: (unnamed test)
 not ok 8 - child test left in queue Test: (unnamed test)
 not ok 9 - child test left in queue Test: t2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-tap.git



More information about the Pkg-javascript-commits mailing list