diff options
| author | Ruediger Meier | 2015-04-14 14:54:52 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2015-04-14 15:00:52 +0200 |
| commit | 1d2dfb9c30e3a1d788e7ec4a5a6b3ad5a3c2eb57 (patch) | |
| tree | cb065893921c7c089c0465fbaf702705547463d7 /tests/ts/logger | |
| parent | Merge branch 'tests-logger' of https://github.com/rudimeier/util-linux (diff) | |
| download | kernel-qcow2-util-linux-1d2dfb9c30e3a1d788e7ec4a5a6b3ad5a3c2eb57.tar.gz kernel-qcow2-util-linux-1d2dfb9c30e3a1d788e7ec4a5a6b3ad5a3c2eb57.tar.xz kernel-qcow2-util-linux-1d2dfb9c30e3a1d788e7ec4a5a6b3ad5a3c2eb57.zip | |
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>
Diffstat (limited to 'tests/ts/logger')
| -rwxr-xr-x | tests/ts/logger/errors | 4 | ||||
| -rwxr-xr-x | tests/ts/logger/formats | 4 | ||||
| -rwxr-xr-x | tests/ts/logger/options | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/tests/ts/logger/errors b/tests/ts/logger/errors index 0b232ecd1..d47c7bc1e 100755 --- a/tests/ts/logger/errors +++ b/tests/ts/logger/errors @@ -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 diff --git a/tests/ts/logger/formats b/tests/ts/logger/formats index 5957feae2..022206152 100755 --- a/tests/ts/logger/formats +++ b/tests/ts/logger/formats @@ -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 diff --git a/tests/ts/logger/options b/tests/ts/logger/options index afcf5f859..ffe143361 100755 --- a/tests/ts/logger/options +++ b/tests/ts/logger/options @@ -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 |