From: Vsevolod Stakhov Date: Fri, 17 Oct 2025 15:13:22 +0000 (+0100) Subject: [Test] Use rspamc -n instead of xargs for parallel scanning X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6910dea107b94cf154a4d2cc00a6183022b6a35b;p=thirdparty%2Frspamd.git [Test] Use rspamc -n instead of xargs for parallel scanning rspamc already supports parallelism via -n flag --- diff --git a/test/integration/scripts/integration-test.sh b/test/integration/scripts/integration-test.sh index 6da4fa1421..287a351cb2 100755 --- a/test/integration/scripts/integration-test.sh +++ b/test/integration/scripts/integration-test.sh @@ -154,10 +154,9 @@ echo "============================================================" echo "" echo "Scanning $TOTAL_EMAILS emails (parallelism: $PARALLEL)..." -# Scan all files from the shuffled list -cat "$DATA_DIR/shuffled_files.txt" | xargs -n 1 -P "$PARALLEL" \ - rspamc -h "$RSPAMD_HOST:$CONTROLLER_PORT" -P "$PASSWORD" -j \ - > "$DATA_DIR/scan_results.json" 2>&1 +# Scan all files from the corpus +rspamc -h "$RSPAMD_HOST:$CONTROLLER_PORT" -P "$PASSWORD" -n "$PARALLEL" -j \ + $(cat "$DATA_DIR/shuffled_files.txt") > "$DATA_DIR/scan_results.json" 2>&1 echo "✓ Scanning complete" echo "" @@ -232,9 +231,8 @@ if [ "$TEST_PROXY" = "true" ]; then echo "Testing via proxy worker ($PROXY_PORT)..." # Use a sample of files for proxy test - head -n 100 "$DATA_DIR/shuffled_files.txt" | xargs -n 1 -P "$PARALLEL" \ - rspamc -h "$RSPAMD_HOST:$PROXY_PORT" -j \ - > "$DATA_DIR/proxy_results.json" 2>&1 + rspamc -h "$RSPAMD_HOST:$PROXY_PORT" -n "$PARALLEL" -j \ + $(head -n 100 "$DATA_DIR/shuffled_files.txt") > "$DATA_DIR/proxy_results.json" 2>&1 echo "✓ Proxy test complete" echo "Results saved to $DATA_DIR/proxy_results.json" fi