diff options
| author | teor <teor@torproject.org> | 2019-11-04 12:28:39 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-05 11:12:50 +1000 |
| commit | 233b96d83addba8d5db49e28f4d762cf34935afc (patch) | |
| tree | f80285b03279c5019af3cd68958f7a7398ce14cb /src/test/test_parseconf.sh | |
| parent | 3763dd998753280684888db97b7fba55b351d79d (diff) | |
| download | tor-233b96d83addba8d5db49e28f4d762cf34935afc.tar.gz tor-233b96d83addba8d5db49e28f4d762cf34935afc.zip | |
test/parseconf: Always show the result file name on failure
Obviously correct fixes on already reviewed code.
Diffstat (limited to 'src/test/test_parseconf.sh')
| -rwxr-xr-x | src/test/test_parseconf.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/test/test_parseconf.sh b/src/test/test_parseconf.sh index cd7cccb32b..86a00f7a02 100755 --- a/src/test/test_parseconf.sh +++ b/src/test/test_parseconf.sh @@ -189,7 +189,7 @@ for dir in "${EXAMPLEDIR}"/*; do --dump-config short \ ${CMDLINE} \ | "${FILTER}" > "${DATA_DIR}/output.${testname}" \ - || die "FAIL: Tor exited." + || die "FAIL: $EXPECTED: Tor reported an error." if cmp "$EXPECTED" "${DATA_DIR}/output.${testname}">/dev/null ; then # Check round-trip. @@ -198,11 +198,12 @@ for dir in "${EXAMPLEDIR}"/*; do --dump-config short \ | "${FILTER}" \ > "${DATA_DIR}/output_2.${testname}" \ - || die "FAIL: Tor exited on round-trip." + || die \ + "FAIL: $EXPECTED: Tor reported an error on round-trip." if ! cmp "${DATA_DIR}/output.${testname}" \ "${DATA_DIR}/output_2.${testname}"; then - echo "FAIL: did not match on round-trip." >&2 + echo "FAIL: $EXPECTED did not match on round-trip." >&2 FINAL_EXIT=$EXITCODE fi @@ -216,7 +217,7 @@ for dir in "${EXAMPLEDIR}"/*; do --verify-config \ ${CMDLINE} || true fi - echo "FAIL: did not match." >&2 + echo "FAIL: $EXPECTED did not match." >&2 diff -u "$EXPECTED" "${DATA_DIR}/output.${testname}" >&2 \ || true FINAL_EXIT=$EXITCODE @@ -236,14 +237,14 @@ for dir in "${EXAMPLEDIR}"/*; do --defaults-torrc "${DEFAULTS}" \ ${CMDLINE} \ > "${DATA_DIR}/output.${testname}" \ - && die "FAIL: Tor did not report an error." + && die "FAIL: $ERROR: Tor did not report an error." expect_err="$(cat $ERROR)" if grep "${expect_err}" "${DATA_DIR}/output.${testname}" >/dev/null; then echo "OK" else echo "FAIL" >&2 - echo "Expected error: ${expect_err}" >&2 + echo "Expected $ERROR: ${expect_err}" >&2 echo "Tor said:" >&2 cat "${DATA_DIR}/output.${testname}" >&2 FINAL_EXIT=$EXITCODE |