ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: fix logger device pathname too long 

$TS_OUTDIR may be too long for sockaddr_un.sun_path. Noticed on travis
in distcheck.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
This commit is contained in:
Ruediger Meier 2015-04-14 14:54:52 +02:00
parent f8c0152970
commit 1d2dfb9c30
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/ts/logger/errors
View File

@ -30,7 +30,8 @@ export LOGGER_TEST_TIMEOFDAY="1234567890.123456"
export LOGGER_TEST_HOSTNAME="test-hostname"
export LOGGER_TEST_GETPID="98765"
DEVLOG="${TS_OUTDIR}/${TS_TESTNAME}_devlog"
DEVLOG="$(mktemp "/tmp/ultest-$TS_COMPONENT-$TS_TESTNAME-XXXXXX")" \
|| ts_die "mktemp failed"
SOCKIN="${TS_OUTDIR}/${TS_TESTNAME}_socketin"
ts_init_socket_to_file $DEVLOG $SOCKIN
SOCAT_PID="$!"
@ -85,6 +86,7 @@ sleep 1
kill $SOCAT_PID
wait $SOCAT_PID &>/dev/null
cat "$SOCKIN" >> "$TS_OUTPUT" 2>&1
rm -f "$DEVLOG" "$SOCKIN"
ts_finalize_subtest
ts_finalize

4
tests/ts/logger/formats
View File

@ -30,7 +30,8 @@ export LOGGER_TEST_TIMEOFDAY="1234567890.123456"
export LOGGER_TEST_HOSTNAME="test-hostname"
export LOGGER_TEST_GETPID="98765"
DEVLOG="${TS_OUTDIR}/${TS_TESTNAME}_devlog"
DEVLOG="$(mktemp "/tmp/ultest-$TS_COMPONENT-$TS_TESTNAME-XXXXXX")" \
|| ts_die "mktemp failed"
SOCKIN="${TS_OUTDIR}/${TS_TESTNAME}_socketin"
ts_init_socket_to_file $DEVLOG $SOCKIN
SOCAT_PID="$!"
@ -74,6 +75,7 @@ sleep 1
kill $SOCAT_PID
wait $SOCAT_PID &>/dev/null
cat "$SOCKIN" >> "$TS_OUTPUT" 2>&1
rm -f "$DEVLOG" "$SOCKIN"
ts_finalize_subtest
ts_finalize

4
tests/ts/logger/options
View File

@ -50,7 +50,8 @@ export LOGGER_TEST_TIMEOFDAY="1234567890.123456"
export LOGGER_TEST_HOSTNAME="test-hostname"
export LOGGER_TEST_GETPID="98765"
DEVLOG="${TS_OUTDIR}/${TS_TESTNAME}_devlog"
DEVLOG="$(mktemp "/tmp/ultest-$TS_COMPONENT-$TS_TESTNAME-XXXXXX")" \
|| ts_die "mktemp failed"
SOCKIN="${TS_OUTDIR}/${TS_TESTNAME}_socketin"
ts_init_socket_to_file $DEVLOG $SOCKIN
SOCAT_PID="$!"
@ -75,6 +76,7 @@ sleep 1
kill $SOCAT_PID
wait $SOCAT_PID &>/dev/null
cat "$SOCKIN" >> "$TS_OUTPUT" 2>&1
rm -f "$DEVLOG" "$SOCKIN"
ts_finalize_subtest
ts_finalize