[C++] Reduce unnecessary shell invocations

When FindEmulator is sure the target directory does not exist,
we do not need to run the shell command.

1 files changed, 2 insertions, 0 deletions

diff --git a/runtest.rb b/runtest.rb
index c8d13d1..5a25cd7 100755
--- a/runtest.rb
+++ b/runtest.rb
@@ -120,6 +120,7 @@ def normalize_make_log(expected)
   expected.gsub!(/Makefile:\d+: commands for target ".*?" failed\n/, '')
   # We treat some warnings as errors.
   expected.gsub!(/Nothing to be done for "test"\.\n/, '')
+  expected.gsub!(/^\/bin\/sh: line 0: /, '')
 
   expected
 end
@@ -135,6 +136,7 @@ def normalize_kati_log(output)
   output.gsub!(/\/bin\/sh: ([^:]*): command not found/,
                "\\1: Command not found")
   output.gsub!(/.*: warning for parse error in an unevaluated line: .*\n/, '')
+  output.gsub!(/^FindEmulator: /, '')
   output.gsub!(/ (\.\/+)+kati\.\S+/, '') # kati log files in find_command.mk
   output.gsub!(/ (\.\/+)+test\S+.json/, '') # json files in find_command.mk
   output