[C++] Fix err_include.mk for -c -n
diff --git a/runtest.rb b/runtest.rb
index 7143ec9..f903310 100755
--- a/runtest.rb
+++ b/runtest.rb
@@ -134,9 +134,9 @@
# ninja to produce. Remove them if we're not testing ninja.
if !via_ninja
expected.gsub!(/^ninja: warning: .*\n/, '')
- # For C++ kati.
- expected.gsub!(/(: )(\S+): (No such file or directory)\n\*\*\* No rule to make target "\2"./, '\1\2: \3')
end
+ # Normalization for "include foo" with C++ kati.
+ expected.gsub!(/(: )(\S+): (No such file or directory)\n\*\*\* No rule to make target "\2"./, '\1\2: \3')
expected
end
@@ -147,9 +147,6 @@
output.gsub!(/^\*kati\*.*\n/, '')
output.gsub!(/^c?kati: /, '')
output.gsub!(/[`'"]/, '"')
- # For go kati.
- output.gsub!(/(: )open (\S+): n(o such file or directory)\nNOTE:.*/,
- "\\1\\2: N\\3")
output.gsub!(/\/bin\/sh: ([^:]*): command not found/,
"\\1: Command not found")
output.gsub!(/.*: warning for parse error in an unevaluated line: .*\n/, '')
@@ -157,6 +154,9 @@
output.gsub!(/^\/bin\/sh: line 0: /, '')
output.gsub!(/ (\.\/+)+kati\.\S+/, '') # kati log files in find_command.mk
output.gsub!(/ (\.\/+)+test\S+.json/, '') # json files in find_command.mk
+ # Normalization for "include foo" with Go kati.
+ output.gsub!(/(: )open (\S+): n(o such file or directory)\nNOTE:.*/,
+ "\\1\\2: N\\3")
output
end