diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2015-12-15 13:14:25 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2015-12-16 11:36:54 +0000 |
| commit | cf1b5cfaac4889cb81c908f9822c8567b8bb519f (patch) | |
| tree | e8d8e162dd59df90bda9b9544258e958c357a948 /third_party/ijar/test | |
| parent | 42c79faf5afa856f656cd0d0a0f6de27c25a98e3 (diff) | |
Fix ijar_test when errexit is on
$(...) is incorrect when doing a test to test the return value, (...)
should be used instead.
--
MOS_MIGRATED_REVID=110248027
Diffstat (limited to 'third_party/ijar/test')
| -rwxr-xr-x | third_party/ijar/test/ijar_test.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/third_party/ijar/test/ijar_test.sh b/third_party/ijar/test/ijar_test.sh index db9a3a7f4d..89f9a4bc75 100755 --- a/third_party/ijar/test/ijar_test.sh +++ b/third_party/ijar/test/ijar_test.sh @@ -96,8 +96,7 @@ function check_consistent_file_contents() { local actual="$(cat $1 | ${MD5SUM} | awk '{ print $1; }')" local filename="$(echo $1 | ${MD5SUM} | awk '{ print $1; }')" local expected="$actual" - disable_errexit - if $(echo "${expected_output}" | grep -q "^${filename} "); then + if (echo "${expected_output}" | grep -q "^${filename} "); then echo "${expected_output}" | grep -q "^${filename} ${actual}$" || { ls -l "$1" fail "output file contents differ" @@ -106,7 +105,6 @@ function check_consistent_file_contents() { expected_output="$expected_output$filename $actual " fi - enable_errexit } function set_up() { |