diff options
| author | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2016-04-27 18:35:57 +0900 |
|---|---|---|
| committer | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2016-04-27 18:35:57 +0900 |
| commit | dc258cb8ea5a528574b96474d89b3a9900e5ceae (patch) | |
| tree | cf8be6962e47074ffdaee74b4c44f8e0296ab4b0 /runtest.rb | |
| parent | 3009771a0c2f2734ea820a0361b0b87ec5b7e7bb (diff) | |
| download | android_build_kati-dc258cb8ea5a528574b96474d89b3a9900e5ceae.tar.gz android_build_kati-dc258cb8ea5a528574b96474d89b3a9900e5ceae.tar.bz2 android_build_kati-dc258cb8ea5a528574b96474d89b3a9900e5ceae.zip | |
Clean up normalization in runtest.rb a bit
Diffstat (limited to 'runtest.rb')
| -rwxr-xr-x | runtest.rb | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -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. |