summaryrefslogtreecommitdiffstats
path: root/tests/ts/logger
diff options
context:
space:
mode:
authorKarel Zak2015-03-16 14:17:49 +0100
committerKarel Zak2015-03-16 14:17:49 +0100
commit77837afcd15106528d9917f87c5af4a3cabf8578 (patch)
tree78bcee9e0a5dabaf60c1bb999d226fa2b0077472 /tests/ts/logger
parenttests: add logger(1) command line options tests (diff)
downloadkernel-qcow2-util-linux-77837afcd15106528d9917f87c5af4a3cabf8578.tar.gz
kernel-qcow2-util-linux-77837afcd15106528d9917f87c5af4a3cabf8578.tar.xz
kernel-qcow2-util-linux-77837afcd15106528d9917f87c5af4a3cabf8578.zip
tests: use --no-act for logger tests
and also use --stderr on one place only. Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/logger')
-rwxr-xr-xtests/ts/logger/options18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/ts/logger/options b/tests/ts/logger/options
index a040a2665..aa2123985 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