diff options
author | Ryan S. Arnold <ryan.arnold@linaro.org> | 2015-08-13 18:33:08 -0500 |
---|---|---|
committer | Ryan S. Arnold <ryan.arnold@linaro.org> | 2015-08-18 12:27:00 -0500 |
commit | f98b8bcdba961e78f49c3b1b0f87b543c1422cf3 (patch) | |
tree | 20979bda9927c232fb7b212ef3247a093a00e001 /testsuite | |
parent | aeaabe8dce9449f060c783a7d0f0ee303c379394 (diff) |
Return 1 if get_git_<foo> services fail.
[https://bugs.linaro.org/show_bug.cgi?id=1751]
This causes ABE to abort early if inputs are malformed, and saves us
from unnecessary execution in such an event. This patch also adds
error messages to the get_git_<foo> services if they're returning
'1'.
Change-Id: I4fe7afc3d3efce3936f0c859dea6dcff7e2ba37f
Diffstat (limited to 'testsuite')
-rwxr-xr-x | testsuite/test.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/test.sh b/testsuite/test.sh index e142f39f..0a37865d 100755 --- a/testsuite/test.sh +++ b/testsuite/test.sh @@ -1630,7 +1630,7 @@ done #confirm that checkout fails with bad repo - abe is so forgiving that I can only find one suitable input rm -rf "${local_snapshots}"/*.git* in="http://" -testing="checkout: ${in} should fail with 'cannot parse repo' message." +testing="checkout: ${in} should fail with 'Malformed input' message." if test x"${debug}" = xyes; then out="`cd ${local_snapshots} && checkout ${in} 2> >(tee /dev/stderr)`" else @@ -1639,7 +1639,7 @@ fi if test $? -eq 0; then fail "${testing}" else - if echo "${out}" | tail -n1 | grep -q "^ERROR.*: git_parser (Malformed input\\. No repo found\\.)$"; then + if echo "${out}" | tail -n1 | grep -q "^ERROR.*: get_git_repo (Malformed input \"http://\")$"; then pass "${testing}" else fail "${testing}" |