From: Vsevolod Stakhov Date: Fri, 17 Oct 2025 19:07:50 +0000 (+0100) Subject: [Test] Disable set -e around scanning to capture errors X-Git-Tag: 3.14.0~67^2~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fc0ff260bd8aa5934eebe7a0372bc8c32df9fc5;p=thirdparty%2Frspamd.git [Test] Disable set -e around scanning to capture errors Use set +e temporarily to allow error log display before exit --- diff --git a/test/integration/scripts/integration-test.sh b/test/integration/scripts/integration-test.sh index ac65ca8b99..d6bbe0ec2e 100755 --- a/test/integration/scripts/integration-test.sh +++ b/test/integration/scripts/integration-test.sh @@ -156,12 +156,16 @@ echo "" echo "Scanning $TOTAL_EMAILS emails (parallelism: $PARALLEL)..." # Scan all files from the corpus using xargs to handle long argument list # Log errors separately for debugging +# Temporarily disable set -e to capture exit code +set +e cat "$DATA_DIR/shuffled_files.txt" | xargs rspamc -h "$RSPAMD_HOST:$CONTROLLER_PORT" \ -P "$PASSWORD" -n "$PARALLEL" -j > "$DATA_DIR/scan_results.json" 2> "$DATA_DIR/scan_errors.log" - SCAN_EXIT=$? +set -e + if [ $SCAN_EXIT -ne 0 ]; then echo "ERROR: Scanning failed with exit code $SCAN_EXIT" + echo "" echo "First 50 lines of error log:" head -n 50 "$DATA_DIR/scan_errors.log" || true echo ""