diff options
| author | Ruediger Meier | 2017-06-01 11:20:02 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2017-06-01 11:24:00 +0200 |
| commit | 22edf0a6396013d77067e7b192f81558e982f675 (patch) | |
| tree | 37ba2dac1e4c6813522199ba4c8c40e5c6043afc | |
| parent | misc: fix some warnings (diff) | |
| download | kernel-qcow2-util-linux-22edf0a6396013d77067e7b192f81558e982f675.tar.gz kernel-qcow2-util-linux-22edf0a6396013d77067e7b192f81558e982f675.tar.xz kernel-qcow2-util-linux-22edf0a6396013d77067e7b192f81558e982f675.zip | |
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 398b3148bedee936ee0b012b3b6e82b20547f218.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
| -rwxr-xr-x | .travis-functions.sh | 2 | ||||
| -rw-r--r-- | tests/expected/misc/swaplabel | 2 | ||||
| -rw-r--r-- | tests/expected/rename/exit_codes | 2 | ||||
| -rwxr-xr-x | tests/ts/misc/swaplabel | 3 | ||||
| -rwxr-xr-x | tests/ts/rename/exit_codes | 3 |
5 files changed, 5 insertions, 7 deletions
diff --git a/.travis-functions.sh b/.travis-functions.sh index 013195f5c..898f57b84 100755 --- a/.travis-functions.sh +++ b/.travis-functions.sh @@ -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 diff --git a/tests/expected/misc/swaplabel b/tests/expected/misc/swaplabel index 790a28c6c..172f876af 100644 --- a/tests/expected/misc/swaplabel +++ b/tests/expected/misc/swaplabel @@ -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 diff --git a/tests/expected/rename/exit_codes b/tests/expected/rename/exit_codes index 3d53010b2..c57781788 100644 --- a/tests/expected/rename/exit_codes +++ b/tests/expected/rename/exit_codes @@ -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 diff --git a/tests/ts/misc/swaplabel b/tests/ts/misc/swaplabel index f934b2179..646304508 100755 --- a/tests/ts/misc/swaplabel +++ b/tests/ts/misc/swaplabel @@ -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 |\ diff --git a/tests/ts/rename/exit_codes b/tests/ts/rename/exit_codes index 3d46120ac..37028162b 100755 --- a/tests/ts/rename/exit_codes +++ b/tests/ts/rename/exit_codes @@ -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 |