[tor-commits] [tor/master] test/parseconf: Warn when the expected_log* file is missing

nickm at torproject.org nickm at torproject.org
Thu Nov 14 14:58:58 UTC 2019


commit aa3e2bbd4bb52f0e8fc550841ffdcf2da3fa2fa7
Author: teor <teor at torproject.org>
Date:   Thu Nov 14 12:57:59 2019 +1000

    test/parseconf: Warn when the expected_log* file is missing
    
    Part of 32451.
---
 src/test/test_parseconf.sh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/test/test_parseconf.sh b/src/test/test_parseconf.sh
index 2298f0234..4fe27d9f5 100755
--- a/src/test/test_parseconf.sh
+++ b/src/test/test_parseconf.sh
@@ -614,12 +614,18 @@ for dir in "${EXAMPLEDIR}"/*; do
             # This case should succeed: run verify-config and see if it does.
 
             check_verify_config "./torrc" \
-                          "$DEFAULTS" \
-                          "$CMDLINE" \
-                          "${DATA_DIR}/output_log.${testname}" \
-                          "$TRUE" \
-                          "$EXPECTED_LOG" \
-                          "log success"
+                                "$DEFAULTS" \
+                                "$CMDLINE" \
+                                "${DATA_DIR}/output_log.${testname}" \
+                                "$TRUE" \
+                                "$EXPECTED_LOG" \
+                                "log success"
+        else
+            printf "\\nNOTICE: Missing '%s_log' file:\\n" \
+                   "$EXPECTED" >&2
+            log_verify_config "./torrc" \
+                              "$DEFAULTS" \
+                              "$CMDLINE"
         fi
 
    elif test -f "$ERROR"; then





More information about the tor-commits mailing list