tests: avoid diff of diffs

Certain diff implementations do not produce comparable output.

Noticed on Alpine Linux/busybox.

CC: Sami Kerola <kerolasa@iki.fi>
Reported-by: Assaf Gordon <assafgordon@gmail.com>
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/tests/expected/utmp/utmpdump-subsecond b/tests/expected/utmp/utmpdump-subsecond
index 9ec40dab687abb0be3871957ebe9f278859b503b..649ab7f8c0090b477ffd3ac9c8cdcd587d4b99f2 100644 (file)
--- a/tests/expected/utmp/utmpdump-subsecond
+++ b/tests/expected/utmp/utmpdump-subsecond
@@ -1,5 +1,4 @@
 last 9 is expected to disappear in conversion
-3c3
-< [0] [00000] [ts/0] [nonvalid] [foo         ] [zero                ] [0.0.0.0        ] [2013-08-28T12:00:00,123456789+0000]
----
-> [0] [00000] [ts/0] [nonvalid] [foo         ] [zero                ] [0.0.0.0        ] [2013-08-28T12:00:00,12345678+0000]
+[7] [00010] [ipv6] [IPv6    ] [root        ] [dns-server          ] [2001:503:ba3e::2:30] [2013-08-28T20:30:40,123456+0000]
+[8] [00011] [ipv6] [IPv6    ] [root        ] [dns-server          ] [2001:503:ba3e::2:30] [2013-08-28T20:40:50,999999+0000]
+[0] [00000] [ts/0] [nonvalid] [foo         ] [zero                ] [0.0.0.0        ] [2013-08-28T12:00:00,12345678+0000]

diff --git a/tests/ts/utmp/utmpdump-subsecond b/tests/ts/utmp/utmpdump-subsecond
index f753a6d76e45c7f7173159fd741cc80149358e5b..f9ee11e90f5571a0193ece6aae599644a4b70be3 100755 (executable)
--- a/tests/ts/utmp/utmpdump-subsecond
+++ b/tests/ts/utmp/utmpdump-subsecond
@@ -22,13 +22,11 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_UTMPDUMP"
 
 OUT_BIN=${TS_OUTDIR}/${TS_TESTNAME}.bin
-OUT_TXT=${TS_OUTDIR}/${TS_TESTNAME}.txt
 
 echo "last 9 is expected to disappear in conversion" > $TS_OUTPUT
 $TS_CMD_UTMPDUMP -r $TS_SELF/subsec > $OUT_BIN 2>/dev/null
-$TS_CMD_UTMPDUMP $OUT_BIN > $OUT_TXT 2>/dev/null
-diff $TS_SELF/subsec $OUT_TXT >> $TS_OUTPUT 2>&1
+$TS_CMD_UTMPDUMP $OUT_BIN >> $TS_OUTPUT 2>/dev/null
 
-rm -f "$OUT_BIN" "$OUT_TXT"
+rm -f "$OUT_BIN"
 
 ts_finalize