From eb61e95f1c625e15728e2a77b2151996a50b9953 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Fri, 30 Aug 2019 16:10:48 +0200 Subject: [PATCH] tests: remove unbuffered ts_run feature It's unnecessary as stdout and stderr are split in the tests. Signed-off-by: Karel Zak --- tests/expected/misc/swaplabel | 3 --- tests/expected/misc/swaplabel.err | 3 +++ tests/expected/rename/exit_codes | 1 - tests/expected/rename/exit_codes.err | 1 + tests/functions.sh | 26 ------------------------- tests/ts/misc/swaplabel | 29 +++++++++++++++------------- tests/ts/rename/exit_codes | 2 +- 7 files changed, 21 insertions(+), 44 deletions(-) create mode 100644 tests/expected/misc/swaplabel.err create mode 100644 tests/expected/rename/exit_codes.err diff --git a/tests/expected/misc/swaplabel b/tests/expected/misc/swaplabel index 790a28c6cf..22255bfe14 100644 --- a/tests/expected/misc/swaplabel +++ b/tests/expected/misc/swaplabel @@ -1,7 +1,4 @@ -mkswap: error: swap area needs to be at least 10 pages -mkswap: : insecure permissions , 0600 suggested. Setting up swapspace version 1, size = 9 pages (9xPGSZ bytes) -mkswap: Label was truncated. LABEL=1234567890abcde, UUID=12345678-abcd-abcd-abcd-1234567890ab LABEL: 1234567890abcde UUID: 12345678-abcd-abcd-abcd-1234567890ab diff --git a/tests/expected/misc/swaplabel.err b/tests/expected/misc/swaplabel.err new file mode 100644 index 0000000000..acfec20f94 --- /dev/null +++ b/tests/expected/misc/swaplabel.err @@ -0,0 +1,3 @@ +mkswap: error: swap area needs to be at least 10 pages +mkswap: : insecure permissions , 0600 suggested. +mkswap: Label was truncated. diff --git a/tests/expected/rename/exit_codes b/tests/expected/rename/exit_codes index 3d53010b2d..07885f7074 100644 --- a/tests/expected/rename/exit_codes +++ b/tests/expected/rename/exit_codes @@ -3,5 +3,4 @@ RENAME_EXIT_NOTHING: 4 `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_SOMEOK: 2 diff --git a/tests/expected/rename/exit_codes.err b/tests/expected/rename/exit_codes.err new file mode 100644 index 0000000000..6478542158 --- /dev/null +++ b/tests/expected/rename/exit_codes.err @@ -0,0 +1 @@ +rename: rename_exit_values.2: rename to rename_exit_codes.2 failed: Is a directory diff --git a/tests/functions.sh b/tests/functions.sh index 1ce03e4536..0af8b96b77 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -436,21 +436,6 @@ function ts_init_py { } function ts_run { - local UNBUFFERED= - - while true; do - case "$1" in - --unbuffered) - UNBUFFERED=1 - shift;; - --) - shift - break;; - *) - break;; - esac - done - declare -a args # @@ -460,17 +445,6 @@ function ts_run { args+=(env ASAN_OPTIONS=detect_leaks=1) fi - # - # Disable buffering of stdout - # - if [ -n "$UNBUFFERED" ]; then - if type unbuffer >/dev/null 2>&1; then - args+=(unbuffer) - elif type stdbuf >/dev/null 2>&1 && [ "$TS_ENABLE_ASAN" != "yes" ]; then - args+=(stdbuf --output=0) - fi - fi - # # valgrind mode # diff --git a/tests/ts/misc/swaplabel b/tests/ts/misc/swaplabel index 5a1bb46fb9..0801cb213a 100755 --- a/tests/ts/misc/swaplabel +++ b/tests/ts/misc/swaplabel @@ -39,26 +39,29 @@ MIN_SWAP_SIZE_KB=$(( MIN_SWAP_SIZE / 1024 )) rm -f $IMAGE fallocate_or_skip $(( $MIN_SWAP_SIZE - 1 )) $IMAGE -ts_run --unbuffered $TS_CMD_MKSWAP \ +$TS_CMD_MKSWAP \ --label 1234567890abcdef \ --uuid 12345678-abcd-abcd-abcd-1234567890ab \ - $IMAGE 2>&1 |\ - sed -e "s/ $MIN_SWAP_SIZE_KB KiB/ 10 pages/" \ - -e "s:$IMAGE::g" \ - -e "s/insecure permissions [0-9]*/insecure permissions /g" \ - >> $TS_OUTPUT 2>> $TS_ERRLOG + $IMAGE >> $TS_OUTPUT 2>> $TS_ERRLOG + +sed -i -e "s/ $MIN_SWAP_SIZE_KB KiB/ 10 pages/" \ + -e "s:$IMAGE::g" \ + -e "s/insecure permissions [0-9]*/insecure permissions /g" \ + $TS_OUTPUT $TS_ERRLOG rm -f $IMAGE fallocate_or_skip $MIN_SWAP_SIZE $IMAGE -ts_run --unbuffered $TS_CMD_MKSWAP \ +$TS_CMD_MKSWAP \ --label 1234567890abcdef \ --uuid 12345678-abcd-abcd-abcd-1234567890ab \ - $IMAGE 2>&1 |\ - sed -e "s/ $(( $MIN_SWAP_SIZE_KB - $PAGE_SIZE_KB )) KiB/ 9 pages/" \ - -e "s/($(( $MIN_SWAP_SIZE - $PAGE_SIZE )) bytes)/(9xPGSZ bytes)/" \ - -e "s:$IMAGE::g" \ - -e "s/insecure permissions [0-9]*/insecure permissions /g" \ - >> $TS_OUTPUT 2>> $TS_ERRLOG + $IMAGE >> $TS_OUTPUT 2>> $TS_ERRLOG + +sed -i -e "s/ $(( $MIN_SWAP_SIZE_KB - $PAGE_SIZE_KB )) KiB/ 9 pages/" \ + -e "s/($(( $MIN_SWAP_SIZE - $PAGE_SIZE )) bytes)/(9xPGSZ bytes)/" \ + -e "s:$IMAGE::g" \ + -e "s/insecure permissions [0-9]*/insecure permissions /g" \ + $TS_OUTPUT $TS_ERRLOG + $TS_CMD_SWAPLABEL $IMAGE >> $TS_OUTPUT 2>> $TS_ERRLOG #rm -f $IMAGE diff --git a/tests/ts/rename/exit_codes b/tests/ts/rename/exit_codes index c7810bb342..a9d9095fd8 100755 --- a/tests/ts/rename/exit_codes +++ b/tests/ts/rename/exit_codes @@ -33,7 +33,7 @@ $TS_CMD_RENAME -v codes values rename_exit_codes.? >> $TS_OUTPUT 2>> $TS_ERRLOG echo "EXIT_SUCCESS: $?" >> $TS_OUTPUT mkdir rename_exit_codes.2 -ts_run --unbuffered $TS_CMD_RENAME -v values codes rename_exit_values.? >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_RENAME -v values codes rename_exit_values.? >> $TS_OUTPUT 2>> $TS_ERRLOG echo "RENAME_EXIT_SOMEOK: $?" >> $TS_OUTPUT rmdir rename_exit_codes.2 -- 2.47.3