Merge pull request #66 from stefanb2/topic-issue-65

Fix issues 60, 63, 65

1 files changed, 5 insertions, 0 deletions

diff --git a/runtest.rb b/runtest.rb
index 330c8b1..a703ab5 100755
--- a/runtest.rb
+++ b/runtest.rb
@@ -16,6 +16,10 @@
 
 require 'fileutils'
 
+# suppress GNU make jobserver magic when calling "make"
+ENV.delete('MAKEFLAGS')
+ENV.delete('MAKELEVEL')
+
 while true
   if ARGV[0] == '-s'
     test_serialization = true
@@ -129,6 +133,7 @@ def normalize_make_log(expected, mk, via_ninja)
                  ' commands commence ')
   expected.gsub!(' (did you mean TAB instead of 8 spaces?)', '')
   expected.gsub!('Extraneous text after', 'extraneous text after')
+  expected.gsub!('missing rule before recipe.', 'missing rule before commands.')
   # Not sure if this is useful.
   expected.gsub!(/\s+Stop\.$/, '')
   # GNU make 4.0 has this output.