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

Revert "tests: use stdbuf when stderr and stdout is randomly ordered" 

stdbuf does not seem to work reliable. Failed on travis/OSX

This reverts commit 398b3148be.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
This commit is contained in:
Ruediger Meier 2017-06-01 11:20:02 +02:00
parent f2ff0adf5d
commit 22edf0a639
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis-functions.sh
View File

@ -125,7 +125,7 @@ function osx_prepare_check
# symlink minimally needed gnu commands into PATH
mkdir ~/bin
for cmd in readlink seq stdbuf truncate find xargs tar sed; do
for cmd in readlink seq truncate find xargs tar sed; do
ln -s /usr/local/bin/g$cmd $HOME/bin/$cmd
done
hash -r

2
tests/expected/misc/swaplabel
View File

@ -1,7 +1,7 @@
mkswap: error: swap area needs to be at least 10 pages
mkswap: <swapfile>: insecure permissions <perm>, 0600 suggested.
Setting up swapspace version 1, size = 9 pages (9xPGSZ bytes)
mkswap: Label was truncated.
Setting up swapspace version 1, size = 9 pages (9xPGSZ bytes)
LABEL=1234567890abcde, UUID=12345678-abcd-abcd-abcd-1234567890ab
LABEL: 1234567890abcde
UUID: 12345678-abcd-abcd-abcd-1234567890ab

2
tests/expected/rename/exit_codes
View File

@ -2,6 +2,6 @@ RENAME_EXIT_NOTHING: 4
`rename_exit_codes.1' -> `rename_exit_values.1'
`rename_exit_codes.2' -> `rename_exit_values.2'
EXIT_SUCCESS: 0
`rename_exit_values.1' -> `rename_exit_codes.1'
rename: rename_exit_values.2: rename to rename_exit_codes.2 failed: Is a directory
`rename_exit_values.1' -> `rename_exit_codes.1'
RENAME_EXIT_SOMEOK: 2

3
tests/ts/misc/swaplabel
View File

@ -20,7 +20,6 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_MKSWAP"
ts_check_test_command "$TS_CMD_SWAPLABEL"
ts_check_prog "stdbuf"
# fallocate does not work on most file systems
function fallocate_or_skip()
@ -50,7 +49,7 @@ $TS_CMD_MKSWAP \
rm -f $IMAGE
fallocate_or_skip $MIN_SWAP_SIZE $IMAGE
stdbuf -oL -eL $TS_CMD_MKSWAP \
$TS_CMD_MKSWAP \
--label 1234567890abcdef \
--uuid 12345678-abcd-abcd-abcd-1234567890ab \
$IMAGE 2>&1 |\

3
tests/ts/rename/exit_codes
View File

@ -22,7 +22,6 @@ TS_DESC="exit codes"
ts_init "$*"
ts_check_test_command "$TS_CMD_RENAME"
ts_check_prog "stdbuf"
ts_cd "$TS_OUTDIR"
touch rename_exit_codes.{1..2}
@ -33,7 +32,7 @@ $TS_CMD_RENAME -v codes values rename_exit_codes.? >> $TS_OUTPUT 2>&1
echo "EXIT_SUCCESS: $?" >> $TS_OUTPUT
mkdir rename_exit_codes.2
stdbuf -oL -eL $TS_CMD_RENAME -v values codes rename_exit_values.? >> $TS_OUTPUT 2>&1
$TS_CMD_RENAME -v values codes rename_exit_values.? >> $TS_OUTPUT 2>&1
echo "RENAME_EXIT_SOMEOK: $?" >> $TS_OUTPUT
rmdir rename_exit_codes.2