summaryrefslogtreecommitdiffstats
path: root/tests/expected
diff options
context:
space:
mode:
authorRuediger Meier2017-06-01 11:20:02 +0200
committerRuediger Meier2017-06-01 11:24:00 +0200
commit22edf0a6396013d77067e7b192f81558e982f675 (patch)
tree37ba2dac1e4c6813522199ba4c8c40e5c6043afc /tests/expected
parentmisc: fix some warnings (diff)
downloadkernel-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>
Diffstat (limited to 'tests/expected')
-rw-r--r--tests/expected/misc/swaplabel2
-rw-r--r--tests/expected/rename/exit_codes2
2 files changed, 2 insertions, 2 deletions
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