From dc258cb8ea5a528574b96474d89b3a9900e5ceae Mon Sep 17 00:00:00 2001 From: Shinichiro Hamaji Date: Wed, 27 Apr 2016 18:35:57 +0900 Subject: Clean up normalization in runtest.rb a bit --- runtest.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'runtest.rb') diff --git a/runtest.rb b/runtest.rb index a703ab5..2bb70ee 100755 --- a/runtest.rb +++ b/runtest.rb @@ -127,13 +127,11 @@ def normalize_make_log(expected, mk, via_ninja) # Normalizations for old/new GNU make. expected.gsub!(/[`'"]/, '"') - expected.gsub!(/ (?:commands|recipe) for target /, - ' commands for target ') - expected.gsub!(/ (?:commands|recipe) commences /, - ' commands commence ') + expected.gsub!(' recipe for target ', ' commands for target ') + expected.gsub!(' recipe commences ', ' commands commence ') + expected.gsub!('missing rule before recipe.', 'missing rule before commands.') 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. -- cgit v1.2.3