From: Karel Zak <kzak@redhat.com>
Date: Mon, 16 Mar 2015 13:17:49 +0000 (+0100)
Subject: tests: use --no-act for logger tests
X-Git-Tag: v2.27-rc1~354
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77837afcd15106528d9917f87c5af4a3cabf8578;p=thirdparty%2Futil-linux.git

tests: use --no-act for logger tests

and also use --stderr on one place only.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tests/ts/logger/options b/tests/ts/logger/options
index a040a2665f..aa21239857 100755
--- a/tests/ts/logger/options
+++ b/tests/ts/logger/options
@@ -34,15 +34,15 @@ echo "<66>" prio_prefix	 > $TS_OUTDIR/input_prio_prefix
 
 # bash 4 might not be available, use go-around hash
 tests_array=(
-	"simple:--stderr test"
-	"log_pid:--stderr -i test"
-	"log_pid_long:--stderr --id test"
-	"log_pid_define:--stderr --id=12345 test"
+	"simple:test"
+	"log_pid:-i test"
+	"log_pid_long:--id test"
+	"log_pid_define:--id=12345 test"
 	"log_pid_no_arg:-is test"
-	"input_file_simple:--stderr -f $TS_OUTDIR/input_simple"
-	"input_file_empty_line:--stderr -f $TS_OUTDIR/input_empty_line"
-	"input_file_skip_empty:--stderr --file $TS_OUTDIR/input_empty_line -e"
-	"input_file_prio_prefix:--stderr --file $TS_OUTDIR/input_prio_prefix --skip-empty --prio-prefix"
+	"input_file_simple:-f $TS_OUTDIR/input_simple"
+	"input_file_empty_line:-f $TS_OUTDIR/input_empty_line"
+	"input_file_skip_empty:--file $TS_OUTDIR/input_empty_line -e"
+	"input_file_prio_prefix:--file $TS_OUTDIR/input_prio_prefix --skip-empty --prio-prefix"
 )
 
 export TZ="GMT"
@@ -55,7 +55,7 @@ for i in "${tests_array[@]}"; do
 	options="${i##*:}"
 
 	ts_init_subtest "$name"
-	$TS_HELPER_LOGGER -t "test_tag" $options > "$TS_OUTPUT" 2>&1
+	$TS_HELPER_LOGGER --stderr --no-act -t "test_tag" $options > "$TS_OUTPUT" 2>&1
 	ts_finalize_subtest
 done