diff options
| author | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2015-04-13 01:16:31 +0900 |
|---|---|---|
| committer | Shinichiro Hamaji <shinichiro.hamaji@gmail.com> | 2015-04-13 01:16:31 +0900 |
| commit | 0c8acade61a54fd7c092579aa077c35316384c4f (patch) | |
| tree | 4550c2fcb3a44439016563102ec2e4e196ffc46b /run_integration_test.rb | |
| parent | 61748ac2fd04262448f0d8e591ca10655be8d376 (diff) | |
| download | kati-0c8acade61a54fd7c092579aa077c35316384c4f.tar.gz | |
Do not normalize multiple whitespaces in run_integration_test
Fixed by c4e427519b5ef9af4007f05f43378294d649455f, but android
still has an issue.
Diffstat (limited to 'run_integration_test.rb')
| -rwxr-xr-x | run_integration_test.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/run_integration_test.rb b/run_integration_test.rb index 7cfc591..3c6c1e8 100755 --- a/run_integration_test.rb +++ b/run_integration_test.rb @@ -25,7 +25,11 @@ class TestCase end def normalize_log(log, out) - log = log.gsub(/[ \t]+/, ' ').split("\n").sort.join("\n").sub(/ Stop\.$/, '') + # TODO: Fix. + if @name == 'android' + log = log.gsub(/[ \t]+/, ' ') + end + log = log.split("\n").sort.join("\n").sub(/ Stop\.$/, '') # This is a completely sane warning from kati for Android. log.sub!(%r(build/core/product_config.mk:152: warning: Unmatched parens: .*\n), '') # Not sure why the order can be inconsistent, but this would be OK. |