rsyslog/backport-testbench-simplify-test-ID-generation-a-bit.patch
2021-09-16 14:45:25 +08:00

26 lines
946 B
Diff

From 19e80e9e5c8d5cfee8a455a59d076c9ad60844e6 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 1 Sep 2020 14:33:41 +0200
Subject: [PATCH] testbench: simplify test ID generation a bit
---
tests/diag.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/diag.sh b/tests/diag.sh
index bc0e408ce..481be9890 100755
--- a/tests/diag.sh
+++ b/tests/diag.sh
@@ -2491,7 +2491,7 @@ case $1 in
echo "hint: was init accidentally called twice?"
exit 2
fi
- export RSYSLOG_DYNNAME="rstb_$(./test_id $(basename $0))$(tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 4 | head -n 1)"
+ export RSYSLOG_DYNNAME="rstb_$(./test_id $(basename $0))$(tr -dc 'a-zA-Z0-9' < /dev/urandom | head --bytes 4)"
export RSYSLOG_OUT_LOG="${RSYSLOG_DYNNAME}.out.log"
export RSYSLOG2_OUT_LOG="${RSYSLOG_DYNNAME}_2.out.log"
export RSYSLOG_PIDBASE="${RSYSLOG_DYNNAME}:" # also used by instance 2!
--
2.23.0