inherit grepInvert as well as greps

tapjs · Jun 23, 2017 · 780f14a · 780f14a
1 parent b4a6c8f
commit 780f14a
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 21 deletions.
diff --git a/bin/run.js b/bin/run.js
@@ -124,6 +124,7 @@ function constructDefaultArgs () {
     reporter: null,
     files: [],
     grep: [],
+    grepInvert: false,
     bail: false,
     saveFile: null,
     pipeToService: false,

diff --git a/lib/test.js b/lib/test.js
@@ -127,8 +127,11 @@ Test.prototype.sub = function (Class, extra, caller) {
     return Promise.resolve(this)
   }
 
-  if (!extra.grep)
+  if (!extra.grep) {
     extra.grep = this.grep.slice(1)
+    extra.grepInvert = this.grepInvert
+  }
+
   extra.indent = '    '
   if (this.jobs > 1 && process.env.TAP_BUFFER === undefined)
     extra.buffered = ownOr(extra, 'buffered', true)

diff --git a/test/test/grep--bail--buffer.tap b/test/test/grep--bail--buffer.tap
@@ -94,18 +94,18 @@ ok 4 - a ___/# time=[0-9.]+(ms)?/~~~ {
     ok 1 - x # SKIP filter out: /[^z]/
     ok 2 - y # SKIP filter out: /[^z]/
     ok 3 - z ___/# time=[0-9.]+(ms)?/~~~ {
-        ok 1 - abc ___/# time=[0-9.]+(ms)?/~~~ {
-            ok 1 - 123 ___/# time=[0-9.]+(ms)?/~~~ {
+        ok 1 - abc # SKIP filter out: /b/
+        ok 2 - xyz ___/# time=[0-9.]+(ms)?/~~~ {
+            ok 1 - 123 # SKIP filter out: /[246]+/
+            ok 2 - ijk ___/# time=[0-9.]+(ms)?/~~~ {
                 ok 1 - this is fine
                 1..1
             }
 
-            ok 2 - ijk # SKIP filter: /[246]+/
             1..2
             # skip: 1
         }
 
-        ok 2 - xyz # SKIP filter: /b/
         1..2
         # skip: 1
     }

diff --git a/test/test/grep--bail.tap b/test/test/grep--bail.tap
@@ -94,18 +94,18 @@ ok 3 - a ___/# time=[0-9.]+(ms)?/~~~
     ok 1 - x # SKIP filter out: /[^z]/
     ok 2 - y # SKIP filter out: /[^z]/
     # Subtest: z
-        # Subtest: abc
-            # Subtest: 123
+        ok 1 - abc # SKIP filter out: /b/
+        # Subtest: xyz
+            ok 1 - 123 # SKIP filter out: /[246]+/
+            # Subtest: ijk
                 ok 1 - this is fine
                 1..1
-            ok 1 - 123 ___/# time=[0-9.]+(ms)?/~~~
+            ok 2 - ijk ___/# time=[0-9.]+(ms)?/~~~
 
-            ok 2 - ijk # SKIP filter: /[246]+/
             1..2
             # skip: 1
-        ok 1 - abc ___/# time=[0-9.]+(ms)?/~~~
+        ok 2 - xyz ___/# time=[0-9.]+(ms)?/~~~
 
-        ok 2 - xyz # SKIP filter: /b/
         1..2
         # skip: 1
     ok 3 - z ___/# time=[0-9.]+(ms)?/~~~

diff --git a/test/test/grep--buffer.tap b/test/test/grep--buffer.tap
@@ -94,18 +94,18 @@ ok 4 - a ___/# time=[0-9.]+(ms)?/~~~ {
     ok 1 - x # SKIP filter out: /[^z]/
     ok 2 - y # SKIP filter out: /[^z]/
     ok 3 - z ___/# time=[0-9.]+(ms)?/~~~ {
-        ok 1 - abc ___/# time=[0-9.]+(ms)?/~~~ {
-            ok 1 - 123 ___/# time=[0-9.]+(ms)?/~~~ {
+        ok 1 - abc # SKIP filter out: /b/
+        ok 2 - xyz ___/# time=[0-9.]+(ms)?/~~~ {
+            ok 1 - 123 # SKIP filter out: /[246]+/
+            ok 2 - ijk ___/# time=[0-9.]+(ms)?/~~~ {
                 ok 1 - this is fine
                 1..1
             }
 
-            ok 2 - ijk # SKIP filter: /[246]+/
             1..2
             # skip: 1
         }
 
-        ok 2 - xyz # SKIP filter: /b/
         1..2
         # skip: 1
     }

diff --git a/test/test/grep.tap b/test/test/grep.tap
@@ -94,18 +94,18 @@ ok 3 - a ___/# time=[0-9.]+(ms)?/~~~
     ok 1 - x # SKIP filter out: /[^z]/
     ok 2 - y # SKIP filter out: /[^z]/
     # Subtest: z
-        # Subtest: abc
-            # Subtest: 123
+        ok 1 - abc # SKIP filter out: /b/
+        # Subtest: xyz
+            ok 1 - 123 # SKIP filter out: /[246]+/
+            # Subtest: ijk
                 ok 1 - this is fine
                 1..1
-            ok 1 - 123 ___/# time=[0-9.]+(ms)?/~~~
+            ok 2 - ijk ___/# time=[0-9.]+(ms)?/~~~
 
-            ok 2 - ijk # SKIP filter: /[246]+/
             1..2
             # skip: 1
-        ok 1 - abc ___/# time=[0-9.]+(ms)?/~~~
+        ok 2 - xyz ___/# time=[0-9.]+(ms)?/~~~
 
-        ok 2 - xyz # SKIP filter: /b/
         1..2
         # skip: 1
     ok 3 - z ___/# time=[0-9.]+(ms)?/~~~