equal
deleted
inserted
replaced
1 Changes needed to make the hexdump and tailf tests work correctly. |
1 Changes needed to make the tailf tests work correctly. |
2 |
2 |
3 These will be passed upstream. |
3 These will be passed upstream. |
4 |
4 |
5 --- util-linux-2.24.2/tests/ts/hexdump/empty-format.orig 2014-06-06 08:21:49.459889429 -0700 |
5 --- util-linux-2.25.2/tests/ts/tailf/simple.orig 2015-02-16 18:13:47.493114932 -0800 |
6 +++ util-linux-2.24.2/tests/ts/hexdump/empty-format 2014-06-06 08:31:18.548924420 -0700 |
6 +++ util-linux-2.25.2/tests/ts/tailf/simple 2015-03-01 15:18:29.040656789 -0800 |
7 @@ -18,9 +18,10 @@ |
7 @@ -27,9 +27,9 @@ |
8 . $TS_TOPDIR/functions.sh |
|
9 ts_init "$*" |
|
10 |
8 |
11 -INPUT=$(printf \\1) |
9 $TS_CMD_TAILF $INPUT > $TS_OUTPUT 2>&1 & |
12 -$TS_CMD_HEXDUMP -n1 -ve '2 "" "%x"' <<< $INPUT 2>&1 >> $TS_OUTPUT |
|
13 +$TS_CMD_HEXDUMP -b $TS_SELF/hexdump-input >> $TS_OUTPUT |
|
14 |
10 |
15 -$TS_CMD_HEXDUMP -n1 -ve '4 "%x"' -e '2 ""' <<< $INPUT 2>&1 >> $TS_OUTPUT |
11 -sleep 0.5 |
16 +$TS_CMD_HEXDUMP -c $TS_SELF/hexdump-input >> $TS_OUTPUT |
12 +sleep 0.1 |
17 + |
|
18 +$TS_CMD_HEXDUMP -C $TS_SELF/hexdump-input >> $TS_OUTPUT |
|
19 |
|
20 ts_finalize |
|
21 --- util-linux-2.24.2/tests/ts/tailf/simple.orig 2014-06-04 07:52:07.774218747 -0700 |
|
22 +++ util-linux-2.24.2/tests/ts/tailf/simple 2014-06-04 07:51:51.126976578 -0700 |
|
23 @@ -27,7 +27,7 @@ |
|
24 |
|
25 sleep 0.1 |
|
26 echo {0..9} >> $INPUT |
13 echo {0..9} >> $INPUT |
27 -sleep 0.1 |
14 -sleep 0.5 |
28 +sleep 0.2 |
15 +sleep 0.2 |
29 |
16 |
30 rm -f $INPUT |
17 rm -f $INPUT |
31 |
18 |