[C++] Fix testcase/nothing_to_do.mk

Change-Id: Ic370c2e2442efc5eb0cde9294e0f18084bdabeca

1 files changed, 6 insertions, 4 deletions

diff --git a/runtest.rb b/runtest.rb
index b4e98a5..ca42048 100755
--- a/runtest.rb
+++ b/runtest.rb
@@ -101,7 +101,7 @@ def normalize_ninja_log(log, mk)
   log
 end
 
-def normalize_make_log(expected)
+def normalize_make_log(expected, mk)
   expected.gsub!(/^make(?:\[\d+\])?: (Entering|Leaving) directory.*\n/, '')
   expected.gsub!(/^make(?:\[\d+\])?: /, '')
   expected = move_circular_dep(expected)
@@ -119,7 +119,9 @@ def normalize_make_log(expected)
   # GNU make 4.0 has this output.
   expected.gsub!(/Makefile:\d+: commands for target ".*?" failed\n/, '')
   # We treat some warnings as errors.
-  expected.gsub!(/Nothing to be done for "test"\.\n/, '')
+  if mk =~ /err_invalid_ifeq3.mk/
+    expected.gsub!(/Nothing to be done for "test"\.\n/, '')
+  end
   expected.gsub!(/^\/bin\/sh: line 0: /, '')
 
   expected
@@ -190,7 +192,7 @@ run_make_test = proc do |mk|
       end
       cmd += " #{tc} 2>&1"
       res = `#{cmd}`
-      res = normalize_make_log(res)
+      res = normalize_make_log(res, mk)
       expected += "=== #{tc} ===\n" + res
       expected_files = get_output_filenames
       expected += "\n=== FILES ===\n#{expected_files * "\n"}\n"
@@ -297,7 +299,7 @@ run_shell_test = proc do |sh|
 
     output = IO.popen(cmd, 'r:binary', &:read)
 
-    expected = normalize_make_log(expected)
+    expected = normalize_make_log(expected, sh)
     output = normalize_kati_log(output)
     if is_ninja_test
       output = normalize_ninja_log(output, sh)