remove output tests for bail cases that don't bail

scripts/generate-test-test.js

@@ -47,39 +47,46 @@ function generate (file, bail, buffer) {
   c.stdout.on('data', function (d) {
     output += d
   })
-  c.on('close', function () {
-    var timep = '# time=[0-9.]+(ms)?'
-    var timere = new RegExp(timep, 'g')
-    output = output.replace(timere, '___/' + timep + '/~~~')
 
-    // raw stack traces vary in depth between node versions, and always
-    // cause problems.  Replace them with an obvious failure.
-    output = output.replace(
-      /^    at .*?:[0-9]+:[0-9]+\)?$/mg,
-      'ERROR: stacks will cause problems, please fix this in the test')
+  c.on('close', function (code, signal) {
+    if (bail && code === 0 && signal === null) {
+      // no point testing bailouts if no bailout happens
+      try { fs.unlinkSync(outfile) } catch (er) {}
+    } else {
+
+      var timep = '# time=[0-9.]+(ms)?'
+      var timere = new RegExp(timep, 'g')
+      output = output.replace(timere, '___/' + timep + '/~~~')
 
-    output = output.split(file).join('___/.*/~~~' + path.basename(file))
-    output = output.split(f).join('___/.*/~~~' + path.basename(f))
+      // raw stack traces vary in depth between node versions, and always
+      // cause problems.  Replace them with an obvious failure.
+      output = output.replace(
+        /^    at .*?:[0-9]+:[0-9]+\)?$/mg,
+        'ERROR: stacks will cause problems, please fix this in the test')
 
-    var dir = path.dirname(file)
-    output = output.split(dir + '/').join('___/.*/~~~')
-    output = output.split(dir).join('___/.*/~~~' + path.basename(dir))
+      output = output.split(file).join('___/.*/~~~' + path.basename(file))
+      output = output.split(f).join('___/.*/~~~' + path.basename(f))
 
-    output = output.split(cwd + '/').join('___/.*/~~~')
-    output = output.split(cwd).join('___/.*/~~~')
+      var dir = path.dirname(file)
+      output = output.split(dir + '/').join('___/.*/~~~')
+      output = output.split(dir).join('___/.*/~~~' + path.basename(dir))
 
-    output = output.split(node + ' ___/').join('\0N1\0')
-    output = output.split(path.basename(node) + ' ___/').join('\0N1\0')
+      output = output.split(cwd + '/').join('___/.*/~~~')
+      output = output.split(cwd).join('___/.*/~~~')
 
-    output = output.split(node).join('\0N2\0')
-    output = output.split(path.basename(node)).join('\0N2\0')
+      output = output.split(node + ' ___/').join('\0N1\0')
+      output = output.split(path.basename(node) + ' ___/').join('\0N1\0')
 
-    output = output.split('\0N1\0').join('___/.*(node|iojs)(\.exe)?')
-    output = output.split('\0N2\0').join('___/.*(node|iojs)(\.exe)?/~~~')
+      output = output.split(node).join('\0N2\0')
+      output = output.split(path.basename(node)).join('\0N2\0')
 
-    output = yamlishToJson(output)
+      output = output.split('\0N1\0').join('___/.*(node|iojs)(\.exe)?')
+      output = output.split('\0N2\0').join('___/.*(node|iojs)(\.exe)?/~~~')
 
-    fs.writeFileSync(outfile, output)
+      output = yamlishToJson(output)
+
+      fs.writeFileSync(outfile, output)
+    }
 
     running = false
     if (queue.length) {

test/test.js

@@ -92,10 +92,20 @@ function runTests (file, bail, buffer) {
 
 function runTest (t, bail, buffer, file) {
   var resfile = file.replace(/\.js$/,
-   (bail ? '--bail' : '') +
-   (buffer ? '--buffer' : '') +
-   '.tap')
-  var want = fs.readFileSync(resfile, 'utf8').split(/\r?\n/)
+    (bail ? '--bail' : '') +
+    (buffer ? '--buffer' : '') +
+    '.tap')
+
+  var want
+  try {
+    want = fs.readFileSync(resfile, 'utf8').split(/\r?\n/)
+  } catch (er) {
+    // there isn't an output file for bail tests that pass.
+    if (bail)
+      return t.end()
+    else
+      throw er
+  }
 
   var child = spawn(node, [file], {
     stdio: [ 0, 'pipe', 'pipe' ],