From cbf858aa085e25aa5afd1d06decaea6e14a8963f Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Fri, 30 Aug 2019 15:50:07 +0200 Subject: [PATCH] tests: split stdout and stderr * add $TS_ERRLOG for script stderr output * add optional $TS_EXPECTED_ERR which points to expected/*/*.err This change allows to keep track about stderr output from our commands (already found bug in sfdisk...). We do not have to depend on fragile stdout vs. stderr order (due to different buffering semantic in different libc, etc.). Signed-off-by: Karel Zak --- tests/expected/blkdiscard/offsets | 20 -- tests/expected/blkdiscard/offsets.err | 20 ++ .../cramfs/fsck-bad-header-nopad-4K-be | 8 - .../cramfs/fsck-bad-header-nopad-4K-be.err | 15 + .../cramfs/fsck-bad-header-nopad-4K-le | 8 - .../cramfs/fsck-bad-header-nopad-4K-le.err | 15 + .../expected/cramfs/fsck-bad-header-pad-4K-be | 8 - .../cramfs/fsck-bad-header-pad-4K-be.err | 15 + .../expected/cramfs/fsck-bad-header-pad-4K-le | 8 - .../cramfs/fsck-bad-header-pad-4K-le.err | 15 + .../cramfs/fsck-bad-header-pad-64K-be | 8 - .../cramfs/fsck-bad-header-pad-64K-be.err | 15 + .../cramfs/fsck-bad-header-pad-64K-le | 8 - .../cramfs/fsck-bad-header-pad-64K-le.err | 15 + tests/expected/cramfs/fsck-bad-header.err | 0 tests/expected/fdisk/gpt-resize | 11 - tests/expected/fdisk/gpt-resize.err | 4 + tests/expected/fdisk/oddinput | 8 +- tests/expected/fdisk/oddinput.err | 4 + tests/expected/fincore/count.4096 | 2 - tests/expected/fincore/count.65536 | 2 - tests/expected/fincore/count.err.4096 | 4 + tests/expected/fincore/count.err.65536 | 4 + tests/expected/fincore/count.err.nosize | 4 + tests/expected/fincore/count.nosize | 2 - tests/expected/getopt/basic.err | 0 .../options-alternative_option_clash.err | 0 .../options-alternative_option_long.err | 0 .../options-alternative_option_short.err | 0 tests/expected/getopt/options-compatible | 2 - tests/expected/getopt/options-compatible.err | 2 + tests/expected/getopt/options-csh.err | 0 .../getopt/options-invalid_getopt_option | 2 - .../getopt/options-invalid_getopt_option.err | 2 + .../getopt/options-invocation_model_one.err | 0 .../options-invocation_model_three_as_one.err | 0 .../options-invocation_model_two_as_one.err | 0 .../options-invocation_without_parameters | 2 - .../options-invocation_without_parameters.err | 2 + .../getopt/options-long_option_ambiguous_1 | 1 - .../options-long_option_ambiguous_1.err | 1 + tests/expected/getopt/options-longopts.err | 0 .../expected/getopt/options-name_option_long | 2 - .../getopt/options-name_option_long.err | 2 + .../expected/getopt/options-name_option_short | 2 - .../getopt/options-name_option_short.err | 2 + tests/expected/getopt/options-no-arguments | 2 - .../expected/getopt/options-no-arguments.err | 2 + tests/expected/getopt/options-non-option.err | 0 .../getopt/options-posix_correctly.err | 0 .../getopt/options-quiet_option_long.err | 0 .../getopt/options-quiet_option_short.err | 0 .../getopt/options-quiet_output_option_long | 4 - .../options-quiet_output_option_long.err | 4 + .../getopt/options-quiet_output_option_short | 4 - .../options-quiet_output_option_short.err | 4 + .../options-same_long_short_options.err | 0 tests/expected/getopt/options-sh.err | 0 .../options-test_for_enhanced_getopt.err | 0 tests/expected/getopt/options-unknown_options | 2 - .../getopt/options-unknown_options.err | 2 + .../getopt/options-unquoted_option_bash.err | 0 .../getopt/options-unquoted_option_tcsh.err | 0 .../getopt/options-weird_quoting_bash.err | 0 .../getopt/options-weird_quoting_tcsh.err | 0 tests/expected/getopt/options.err | 0 tests/expected/kill/all_processes | 2 - tests/expected/kill/all_processes.err | 5 + tests/expected/logger/errors-check_socket.err | 0 tests/expected/logger/errors-id_with_space | 5 - .../expected/logger/errors-id_with_space.err | 5 + tests/expected/logger/errors-invalid_prio | 1 - tests/expected/logger/errors-invalid_prio.err | 1 + tests/expected/logger/errors-invalid_socket | 1 - .../expected/logger/errors-invalid_socket.err | 1 + tests/expected/logger/errors-kern_priority | 1 - .../expected/logger/errors-kern_priority.err | 1 + .../logger/errors-kern_priority_numeric | 1 - .../logger/errors-kern_priority_numeric.err | 1 + tests/expected/logger/errors-multi-line | 3 - tests/expected/logger/errors-multi-line.err | 3 + .../logger/errors-rfc5424_exceed_size | 1 - .../logger/errors-rfc5424_exceed_size.err | 1 + .../logger/errors-rfc5424_msgid_with_space | 1 - .../errors-rfc5424_msgid_with_space.err | 1 + tests/expected/logger/errors-tag_with_space | 2 - .../expected/logger/errors-tag_with_space.err | 2 + tests/expected/logger/errors-tcp | 1 - tests/expected/logger/errors-tcp.err | 1 + tests/expected/logger/formats-check_socket | 1 - .../expected/logger/formats-check_socket.err | 0 tests/expected/logger/formats-octet_counting | 2 - .../logger/formats-octet_counting.err | 2 + tests/expected/logger/formats-priorities | 304 ------------------ tests/expected/logger/formats-priorities.err | 304 ++++++++++++++++++ tests/expected/logger/formats-rfc3164 | 2 - tests/expected/logger/formats-rfc3164.err | 2 + tests/expected/logger/formats-rfc5424_msgid | 2 - .../expected/logger/formats-rfc5424_msgid.err | 2 + tests/expected/logger/formats-rfc5424_nohost | 2 - .../logger/formats-rfc5424_nohost.err | 2 + tests/expected/logger/formats-rfc5424_notime | 2 - .../logger/formats-rfc5424_notime.err | 2 + tests/expected/logger/formats-rfc5424_simple | 2 - .../logger/formats-rfc5424_simple.err | 2 + tests/expected/logger/journald | 3 - tests/expected/logger/journald.err | 3 + tests/expected/logger/options-check_socket | 1 - .../expected/logger/options-check_socket.err | 0 .../logger/options-input_file_empty_line | 4 - .../logger/options-input_file_empty_line.err | 4 + .../logger/options-input_file_prio_prefix | 2 - .../logger/options-input_file_prio_prefix.err | 2 + .../expected/logger/options-input_file_simple | 2 - .../logger/options-input_file_simple.err | 2 + .../logger/options-input_file_skip_empty | 3 - .../logger/options-input_file_skip_empty.err | 3 + tests/expected/logger/options-log_pid | 2 - tests/expected/logger/options-log_pid.err | 2 + tests/expected/logger/options-log_pid_define | 2 - .../logger/options-log_pid_define.err | 2 + tests/expected/logger/options-log_pid_long | 2 - .../expected/logger/options-log_pid_long.err | 2 + tests/expected/logger/options-log_pid_no_arg | 2 - .../logger/options-log_pid_no_arg.err | 2 + tests/expected/logger/options-simple | 2 - tests/expected/logger/options-simple.err | 2 + tests/expected/logger/options.err | 0 tests/expected/minix/fsck | 5 - tests/expected/minix/fsck.err | 32 ++ tests/expected/misc/ionice | 7 - tests/expected/misc/ionice.err | 7 + .../misc/mountpoint-mutually-exclusive | 1 - .../misc/mountpoint-mutually-exclusive.err | 1 + tests/expected/misc/setarch-options | 2 - tests/expected/misc/setarch-options.err | 4 + tests/expected/misc/strtosize | 4 - tests/expected/misc/strtosize.err | 4 + tests/expected/sfdisk/dos-explicit-size | 7 - tests/expected/sfdisk/dos-explicit-size.err | 7 + tests/expected/sfdisk/dos-read-dump | 2 - tests/expected/sfdisk/dos-read-dump.err | 2 + tests/expected/sfdisk/gpt-attrs | 2 - tests/expected/sfdisk/gpt-attrs-broken-guid | 2 - .../expected/sfdisk/gpt-attrs-broken-guid.err | 2 + tests/expected/sfdisk/gpt-attrs-broken-nosep | 2 - .../sfdisk/gpt-attrs-broken-nosep.err | 2 + tests/expected/sfdisk/gpt-attrs-guid | 2 - tests/expected/sfdisk/gpt-attrs-guid.err | 0 tests/expected/sfdisk/gpt-attrs-space | 2 - tests/expected/sfdisk/gpt-attrs-space.err | 0 tests/expected/sfdisk/gpt-attrs-unsupported | 2 - .../expected/sfdisk/gpt-attrs-unsupported.err | 2 + tests/expected/sfdisk/gpt-attrs-with-typo | 2 - tests/expected/sfdisk/gpt-attrs-with-typo.err | 0 tests/expected/sfdisk/gpt-attrs.err | 0 tests/expected/sfdisk/gpt-list-pmbr | 1 - tests/expected/sfdisk/gpt-list-pmbr.err | 1 + tests/expected/sfdisk/script-broken-1 | 3 +- tests/expected/sfdisk/script-broken-1.err | 1 + tests/expected/sfdisk/script-broken-2 | 3 +- tests/expected/sfdisk/script-broken-2.err | 1 + tests/expected/sfdisk/script-broken-3 | 3 +- tests/expected/sfdisk/script-broken-3.err | 1 + tests/expected/sfdisk/script-broken-4 | 3 +- tests/expected/sfdisk/script-broken-4.err | 1 + tests/expected/sfdisk/script-broken-5 | 3 +- tests/expected/sfdisk/script-broken-5.err | 1 + tests/expected/sfdisk/wipe-fs-to-dos | 4 +- tests/expected/sfdisk/wipe-fs-to-dos.err | 0 .../expected/sfdisk/wipe-gpt-to-dos-auto.err | 0 tests/expected/sfdisk/wipe-gpt-to-dos.err | 0 tests/expected/sfdisk/wipe-partition | 1 - tests/expected/sfdisk/wipe-partition.err | 1 + tests/expected/sfdisk/wipe.err | 0 tests/functions.sh | 79 +++-- tests/ts/blkdiscard/offsets | 2 +- tests/ts/blkid/dm-err | 2 +- tests/ts/blkid/low-probe | 2 +- tests/ts/blkid/md-raid0-whole | 10 +- tests/ts/blkid/md-raid1-part | 12 +- tests/ts/blkid/md-raid1-whole | 10 +- tests/ts/colcrt/functional | 16 +- tests/ts/colcrt/regressions | 2 +- tests/ts/colrm/rm2-2 | 2 +- tests/ts/column/columnate | 13 +- tests/ts/column/invalid-multibyte | 2 +- tests/ts/column/multi-file | 2 +- tests/ts/column/table | 34 +- tests/ts/cramfs/doubles | 2 +- tests/ts/cramfs/fsck-bad-header | 4 +- tests/ts/cramfs/fsck-endianness | 4 +- tests/ts/cramfs/mkfs | 4 +- tests/ts/cramfs/mkfs-endianness | 2 +- tests/ts/dmesg/indentation | 14 +- tests/ts/fdisk/align-512-4K | 4 +- tests/ts/fdisk/align-512-4K-63 | 4 +- tests/ts/fdisk/align-512-4K-md | 12 +- tests/ts/fdisk/align-512-512 | 2 +- tests/ts/fdisk/align-512-512-topology | 4 +- tests/ts/fdisk/bsd | 16 +- tests/ts/fdisk/gpt | 2 +- tests/ts/fdisk/gpt-resize | 10 +- tests/ts/fdisk/mbr-dos-mode | 24 +- tests/ts/fdisk/mbr-nondos-mode | 26 +- tests/ts/fdisk/oddinput | 24 +- tests/ts/fdisk/sunlabel | 18 +- tests/ts/fincore/count | 46 ++- tests/ts/fsck/ismounted | 4 +- tests/ts/getopt/basic | 6 +- tests/ts/getopt/options | 68 ++-- tests/ts/hardlink/options | 20 +- tests/ts/hexdump/format-strings | 4 +- tests/ts/ipcs/mk-rm-msg | 4 +- tests/ts/ipcs/mk-rm-sem | 4 +- tests/ts/ipcs/mk-rm-shm | 4 +- tests/ts/isosize/print-size | 6 +- tests/ts/kill/all_processes | 17 +- tests/ts/kill/name_to_number | 4 +- tests/ts/kill/options | 4 +- tests/ts/kill/print_pid | 4 +- tests/ts/kill/queue | 4 +- tests/ts/libfdisk/gpt | 16 +- tests/ts/libfdisk/mkpart | 16 +- tests/ts/libfdisk/mkpart-full | 52 +-- tests/ts/libmount/context | 50 +-- tests/ts/libmount/context-py | 48 +-- tests/ts/libmount/context-utab | 26 +- tests/ts/libmount/context-utab-py | 26 +- tests/ts/libmount/loop | 36 +-- tests/ts/libmount/loop-overlay | 12 +- tests/ts/libmount/utils | 10 +- tests/ts/libsmartcols/fromfile | 34 +- tests/ts/libsmartcols/title | 2 +- tests/ts/logger/errors | 6 +- tests/ts/logger/formats | 8 +- tests/ts/logger/journald | 4 +- tests/ts/logger/options | 8 +- tests/ts/lsblk/lsblk | 2 +- tests/ts/lscpu/lscpu | 6 +- tests/ts/lsmem/lsmem | 2 +- tests/ts/minix/fsck | 8 +- tests/ts/minix/fsck-images | 16 +- tests/ts/minix/mkfs | 2 +- tests/ts/misc/fallocate | 4 +- tests/ts/misc/flock | 2 +- tests/ts/misc/ionice | 12 +- tests/ts/misc/line | 14 +- tests/ts/misc/mbsencode | 8 +- tests/ts/misc/mcookie | 2 +- tests/ts/misc/mountpoint | 12 +- tests/ts/misc/rev | 6 +- tests/ts/misc/setarch | 16 +- tests/ts/misc/setsid | 2 +- tests/ts/misc/strtosize | 68 ++-- tests/ts/misc/swaplabel | 6 +- tests/ts/misc/ul | 2 +- tests/ts/more/regexp | 2 +- tests/ts/more/squeeze | 2 +- tests/ts/mount/devname | 6 +- tests/ts/mount/fslists | 8 +- tests/ts/mount/fstab-btrfs | 28 +- tests/ts/mount/fstab-devname | 4 +- tests/ts/mount/fstab-devname2label | 2 +- tests/ts/mount/fstab-devname2uuid | 2 +- tests/ts/mount/fstab-label | 6 +- tests/ts/mount/fstab-label2devname | 4 +- tests/ts/mount/fstab-label2uuid | 4 +- tests/ts/mount/fstab-loop | 8 +- tests/ts/mount/fstab-none | 2 +- tests/ts/mount/fstab-symlink | 6 +- tests/ts/mount/fstab-uuid | 6 +- tests/ts/mount/fstab-uuid2devname | 4 +- tests/ts/mount/fstab-uuid2label | 4 +- tests/ts/mount/label | 4 +- tests/ts/mount/regfile | 2 +- tests/ts/mount/shared-subtree | 12 +- tests/ts/mount/umount-alltargets | 12 +- tests/ts/mount/umount-recursive | 12 +- tests/ts/mount/uuid | 4 +- tests/ts/namei/logic | 4 +- tests/ts/partx/partx | 20 +- tests/ts/partx/partx-image | 2 +- tests/ts/rename/basic | 2 +- tests/ts/rename/exit_codes | 6 +- tests/ts/rename/overwrite | 4 +- tests/ts/rename/subdir | 20 +- tests/ts/rename/symlink | 2 +- tests/ts/schedutils/chrt | 2 +- tests/ts/schedutils/chrt-non-root | 4 +- tests/ts/script/replay | 6 +- tests/ts/sfdisk/dos | 32 +- tests/ts/sfdisk/gpt | 60 ++-- tests/ts/sfdisk/movedata | 6 +- tests/ts/sfdisk/resize | 10 +- tests/ts/sfdisk/script | 24 +- tests/ts/sfdisk/wipe | 24 +- tests/ts/swapon/devname | 2 +- tests/ts/swapon/label | 2 +- tests/ts/swapon/uuid | 2 +- tests/ts/utmp/utmpdump-circle | 2 +- tests/ts/utmp/utmpdump-tobin | 2 +- tests/ts/utmp/utmpdump-tobin-ipv6 | 2 +- tests/ts/uuid/uuid_parser | 2 +- tests/ts/uuid/uuidd | 9 +- tests/ts/uuid/uuidgen | 4 +- tests/ts/uuid/uuidparse | 2 +- 307 files changed, 1369 insertions(+), 1264 deletions(-) create mode 100644 tests/expected/blkdiscard/offsets.err create mode 100644 tests/expected/cramfs/fsck-bad-header-nopad-4K-be.err create mode 100644 tests/expected/cramfs/fsck-bad-header-nopad-4K-le.err create mode 100644 tests/expected/cramfs/fsck-bad-header-pad-4K-be.err create mode 100644 tests/expected/cramfs/fsck-bad-header-pad-4K-le.err create mode 100644 tests/expected/cramfs/fsck-bad-header-pad-64K-be.err create mode 100644 tests/expected/cramfs/fsck-bad-header-pad-64K-le.err create mode 100644 tests/expected/cramfs/fsck-bad-header.err create mode 100644 tests/expected/fdisk/gpt-resize.err create mode 100644 tests/expected/fdisk/oddinput.err create mode 100644 tests/expected/fincore/count.err.4096 create mode 100644 tests/expected/fincore/count.err.65536 create mode 100644 tests/expected/fincore/count.err.nosize create mode 100644 tests/expected/getopt/basic.err create mode 100644 tests/expected/getopt/options-alternative_option_clash.err create mode 100644 tests/expected/getopt/options-alternative_option_long.err create mode 100644 tests/expected/getopt/options-alternative_option_short.err create mode 100644 tests/expected/getopt/options-compatible.err create mode 100644 tests/expected/getopt/options-csh.err create mode 100644 tests/expected/getopt/options-invalid_getopt_option.err create mode 100644 tests/expected/getopt/options-invocation_model_one.err create mode 100644 tests/expected/getopt/options-invocation_model_three_as_one.err create mode 100644 tests/expected/getopt/options-invocation_model_two_as_one.err create mode 100644 tests/expected/getopt/options-invocation_without_parameters.err create mode 100644 tests/expected/getopt/options-long_option_ambiguous_1.err create mode 100644 tests/expected/getopt/options-longopts.err create mode 100644 tests/expected/getopt/options-name_option_long.err create mode 100644 tests/expected/getopt/options-name_option_short.err create mode 100644 tests/expected/getopt/options-no-arguments.err create mode 100644 tests/expected/getopt/options-non-option.err create mode 100644 tests/expected/getopt/options-posix_correctly.err create mode 100644 tests/expected/getopt/options-quiet_option_long.err create mode 100644 tests/expected/getopt/options-quiet_option_short.err create mode 100644 tests/expected/getopt/options-quiet_output_option_long.err create mode 100644 tests/expected/getopt/options-quiet_output_option_short.err create mode 100644 tests/expected/getopt/options-same_long_short_options.err create mode 100644 tests/expected/getopt/options-sh.err create mode 100644 tests/expected/getopt/options-test_for_enhanced_getopt.err create mode 100644 tests/expected/getopt/options-unknown_options.err create mode 100644 tests/expected/getopt/options-unquoted_option_bash.err create mode 100644 tests/expected/getopt/options-unquoted_option_tcsh.err create mode 100644 tests/expected/getopt/options-weird_quoting_bash.err create mode 100644 tests/expected/getopt/options-weird_quoting_tcsh.err create mode 100644 tests/expected/getopt/options.err create mode 100644 tests/expected/kill/all_processes.err create mode 100644 tests/expected/logger/errors-check_socket.err create mode 100644 tests/expected/logger/errors-id_with_space.err create mode 100644 tests/expected/logger/errors-invalid_prio.err create mode 100644 tests/expected/logger/errors-invalid_socket.err create mode 100644 tests/expected/logger/errors-kern_priority.err create mode 100644 tests/expected/logger/errors-kern_priority_numeric.err create mode 100644 tests/expected/logger/errors-multi-line.err create mode 100644 tests/expected/logger/errors-rfc5424_exceed_size.err create mode 100644 tests/expected/logger/errors-rfc5424_msgid_with_space.err create mode 100644 tests/expected/logger/errors-tag_with_space.err create mode 100644 tests/expected/logger/errors-tcp.err create mode 100644 tests/expected/logger/formats-check_socket.err create mode 100644 tests/expected/logger/formats-octet_counting.err create mode 100644 tests/expected/logger/formats-priorities.err create mode 100644 tests/expected/logger/formats-rfc3164.err create mode 100644 tests/expected/logger/formats-rfc5424_msgid.err create mode 100644 tests/expected/logger/formats-rfc5424_nohost.err create mode 100644 tests/expected/logger/formats-rfc5424_notime.err create mode 100644 tests/expected/logger/formats-rfc5424_simple.err create mode 100644 tests/expected/logger/journald.err create mode 100644 tests/expected/logger/options-check_socket.err create mode 100644 tests/expected/logger/options-input_file_empty_line.err create mode 100644 tests/expected/logger/options-input_file_prio_prefix.err create mode 100644 tests/expected/logger/options-input_file_simple.err create mode 100644 tests/expected/logger/options-input_file_skip_empty.err create mode 100644 tests/expected/logger/options-log_pid.err create mode 100644 tests/expected/logger/options-log_pid_define.err create mode 100644 tests/expected/logger/options-log_pid_long.err create mode 100644 tests/expected/logger/options-log_pid_no_arg.err create mode 100644 tests/expected/logger/options-simple.err create mode 100644 tests/expected/logger/options.err create mode 100644 tests/expected/minix/fsck.err create mode 100644 tests/expected/misc/ionice.err create mode 100644 tests/expected/misc/mountpoint-mutually-exclusive.err create mode 100644 tests/expected/misc/setarch-options.err create mode 100644 tests/expected/misc/strtosize.err create mode 100644 tests/expected/sfdisk/dos-explicit-size.err create mode 100644 tests/expected/sfdisk/dos-read-dump.err create mode 100644 tests/expected/sfdisk/gpt-attrs-broken-guid.err create mode 100644 tests/expected/sfdisk/gpt-attrs-broken-nosep.err create mode 100644 tests/expected/sfdisk/gpt-attrs-guid.err create mode 100644 tests/expected/sfdisk/gpt-attrs-space.err create mode 100644 tests/expected/sfdisk/gpt-attrs-unsupported.err create mode 100644 tests/expected/sfdisk/gpt-attrs-with-typo.err create mode 100644 tests/expected/sfdisk/gpt-attrs.err create mode 100644 tests/expected/sfdisk/gpt-list-pmbr.err create mode 100644 tests/expected/sfdisk/script-broken-1.err create mode 100644 tests/expected/sfdisk/script-broken-2.err create mode 100644 tests/expected/sfdisk/script-broken-3.err create mode 100644 tests/expected/sfdisk/script-broken-4.err create mode 100644 tests/expected/sfdisk/script-broken-5.err create mode 100644 tests/expected/sfdisk/wipe-fs-to-dos.err create mode 100644 tests/expected/sfdisk/wipe-gpt-to-dos-auto.err create mode 100644 tests/expected/sfdisk/wipe-gpt-to-dos.err create mode 100644 tests/expected/sfdisk/wipe-partition.err create mode 100644 tests/expected/sfdisk/wipe.err diff --git a/tests/expected/blkdiscard/offsets b/tests/expected/blkdiscard/offsets index aa90f2f9ef..9af14b3263 100644 --- a/tests/expected/blkdiscard/offsets +++ b/tests/expected/blkdiscard/offsets @@ -2,9 +2,7 @@ create loop device from image testing offsets with full block size Discarded 10485760 bytes from the offset 0 ret: 0 -blkdiscard: offset 1 is not aligned to sector size 512 ret: 1 -blkdiscard: offset 511 is not aligned to sector size 512 ret: 1 Discarded 10485248 bytes from the offset 512 ret: 0 @@ -13,13 +11,9 @@ ret: 0 testing offsets with specific length Discarded 5242880 bytes from the offset 0 ret: 0 -blkdiscard: length 5242881 is not aligned to sector size 512 ret: 1 -blkdiscard: length 5243391 is not aligned to sector size 512 ret: 1 -blkdiscard: offset 1 is not aligned to sector size 512 ret: 1 -blkdiscard: offset 511 is not aligned to sector size 512 ret: 1 Discarded 5242880 bytes from the offset 512 ret: 0 @@ -33,38 +27,24 @@ ret: 0 testing aligned steps with offsets and length Discarded 1024 bytes from the offset 0 ret: 0 -blkdiscard: offset 1 is not aligned to sector size 512 ret: 1 -blkdiscard: offset 1 is not aligned to sector size 512 ret: 1 -blkdiscard: offset 511 is not aligned to sector size 512 ret: 1 Discarded 1536 bytes from the offset 512 ret: 0 Discarded 1024 bytes from the offset 1024 ret: 0 testing misaligned steps full device -blkdiscard: length 1 is not aligned to sector size 512 ret: 1 -blkdiscard: length 256 is not aligned to sector size 512 ret: 1 -blkdiscard: length 511 is not aligned to sector size 512 ret: 1 -blkdiscard: length 513 is not aligned to sector size 512 ret: 1 -blkdiscard: length 768 is not aligned to sector size 512 ret: 1 testing misaligned steps with offsets and length -blkdiscard: length 511 is not aligned to sector size 512 ret: 1 -blkdiscard: offset 1 is not aligned to sector size 512 ret: 1 -blkdiscard: offset 511 is not aligned to sector size 512 ret: 1 -blkdiscard: length 511 is not aligned to sector size 512 ret: 1 -blkdiscard: offset 1 is not aligned to sector size 512 ret: 1 -blkdiscard: offset 511 is not aligned to sector size 512 ret: 1 detach loop device from image diff --git a/tests/expected/blkdiscard/offsets.err b/tests/expected/blkdiscard/offsets.err new file mode 100644 index 0000000000..dbc57dff1b --- /dev/null +++ b/tests/expected/blkdiscard/offsets.err @@ -0,0 +1,20 @@ +blkdiscard: /dev/loop0: offset 1 is not aligned to sector size 512 +blkdiscard: /dev/loop0: offset 511 is not aligned to sector size 512 +blkdiscard: /dev/loop0: length 5242881 is not aligned to sector size 512 +blkdiscard: /dev/loop0: length 5243391 is not aligned to sector size 512 +blkdiscard: /dev/loop0: offset 1 is not aligned to sector size 512 +blkdiscard: /dev/loop0: offset 511 is not aligned to sector size 512 +blkdiscard: /dev/loop0: offset 1 is not aligned to sector size 512 +blkdiscard: /dev/loop0: offset 1 is not aligned to sector size 512 +blkdiscard: /dev/loop0: offset 511 is not aligned to sector size 512 +blkdiscard: /dev/loop0: length 1 is not aligned to sector size 512 +blkdiscard: /dev/loop0: length 256 is not aligned to sector size 512 +blkdiscard: /dev/loop0: length 511 is not aligned to sector size 512 +blkdiscard: /dev/loop0: length 513 is not aligned to sector size 512 +blkdiscard: /dev/loop0: length 768 is not aligned to sector size 512 +blkdiscard: /dev/loop0: length 511 is not aligned to sector size 512 +blkdiscard: /dev/loop0: offset 1 is not aligned to sector size 512 +blkdiscard: /dev/loop0: offset 511 is not aligned to sector size 512 +blkdiscard: /dev/loop0: length 511 is not aligned to sector size 512 +blkdiscard: /dev/loop0: offset 1 is not aligned to sector size 512 +blkdiscard: /dev/loop0: offset 511 is not aligned to sector size 512 diff --git a/tests/expected/cramfs/fsck-bad-header-nopad-4K-be b/tests/expected/cramfs/fsck-bad-header-nopad-4K-be index 397d1ba297..9235faa3ae 100644 --- a/tests/expected/cramfs/fsck-bad-header-nopad-4K-be +++ b/tests/expected/cramfs/fsck-bad-header-nopad-4K-be @@ -1,29 +1,21 @@ ## size: 0 -fsck.cramfs: superblock size (0) too small ret: 4 ## size: 75 -fsck.cramfs: superblock size (75) too small ret: 4 ## size: 76 -fsck.cramfs: file extends past end of filesystem -fsck.cramfs: crc error ret: 4 ## size: 4095 -fsck.cramfs: file extends past end of filesystem -fsck.cramfs: crc error ret: 4 ## size: 4096 ret: 0 ## size: 4097 -fsck.cramfs: file length too short ret: 4 ## size: 4294967295 -fsck.cramfs: file length too short ret: 4 diff --git a/tests/expected/cramfs/fsck-bad-header-nopad-4K-be.err b/tests/expected/cramfs/fsck-bad-header-nopad-4K-be.err new file mode 100644 index 0000000000..0f1e9e83e1 --- /dev/null +++ b/tests/expected/cramfs/fsck-bad-header-nopad-4K-be.err @@ -0,0 +1,15 @@ +## size: 0 +fsck.cramfs: superblock size (0) too small +## size: 75 +fsck.cramfs: superblock size (75) too small +## size: 76 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +## size: 4095 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +## size: 4096 +## size: 4097 +fsck.cramfs: file length too short +## size: 4294967295 +fsck.cramfs: file length too short diff --git a/tests/expected/cramfs/fsck-bad-header-nopad-4K-le b/tests/expected/cramfs/fsck-bad-header-nopad-4K-le index 397d1ba297..9235faa3ae 100644 --- a/tests/expected/cramfs/fsck-bad-header-nopad-4K-le +++ b/tests/expected/cramfs/fsck-bad-header-nopad-4K-le @@ -1,29 +1,21 @@ ## size: 0 -fsck.cramfs: superblock size (0) too small ret: 4 ## size: 75 -fsck.cramfs: superblock size (75) too small ret: 4 ## size: 76 -fsck.cramfs: file extends past end of filesystem -fsck.cramfs: crc error ret: 4 ## size: 4095 -fsck.cramfs: file extends past end of filesystem -fsck.cramfs: crc error ret: 4 ## size: 4096 ret: 0 ## size: 4097 -fsck.cramfs: file length too short ret: 4 ## size: 4294967295 -fsck.cramfs: file length too short ret: 4 diff --git a/tests/expected/cramfs/fsck-bad-header-nopad-4K-le.err b/tests/expected/cramfs/fsck-bad-header-nopad-4K-le.err new file mode 100644 index 0000000000..0f1e9e83e1 --- /dev/null +++ b/tests/expected/cramfs/fsck-bad-header-nopad-4K-le.err @@ -0,0 +1,15 @@ +## size: 0 +fsck.cramfs: superblock size (0) too small +## size: 75 +fsck.cramfs: superblock size (75) too small +## size: 76 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +## size: 4095 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +## size: 4096 +## size: 4097 +fsck.cramfs: file length too short +## size: 4294967295 +fsck.cramfs: file length too short diff --git a/tests/expected/cramfs/fsck-bad-header-pad-4K-be b/tests/expected/cramfs/fsck-bad-header-pad-4K-be index 8e2316183c..78c6bd2bae 100644 --- a/tests/expected/cramfs/fsck-bad-header-pad-4K-be +++ b/tests/expected/cramfs/fsck-bad-header-pad-4K-be @@ -1,29 +1,21 @@ ## size: 76 -fsck.cramfs: superblock size (76) too small ret: 4 ## size: 587 -fsck.cramfs: superblock size (587) too small ret: 4 ## size: 588 -fsck.cramfs: file extends past end of filesystem -fsck.cramfs: crc error ret: 4 ## size: 4095 -fsck.cramfs: file extends past end of filesystem -fsck.cramfs: crc error ret: 4 ## size: 4096 ret: 0 ## size: 4097 -fsck.cramfs: file length too short ret: 4 ## size: 4294967295 -fsck.cramfs: file length too short ret: 4 diff --git a/tests/expected/cramfs/fsck-bad-header-pad-4K-be.err b/tests/expected/cramfs/fsck-bad-header-pad-4K-be.err new file mode 100644 index 0000000000..27e45df5ed --- /dev/null +++ b/tests/expected/cramfs/fsck-bad-header-pad-4K-be.err @@ -0,0 +1,15 @@ +## size: 76 +fsck.cramfs: superblock size (76) too small +## size: 587 +fsck.cramfs: superblock size (587) too small +## size: 588 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +## size: 4095 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +## size: 4096 +## size: 4097 +fsck.cramfs: file length too short +## size: 4294967295 +fsck.cramfs: file length too short diff --git a/tests/expected/cramfs/fsck-bad-header-pad-4K-le b/tests/expected/cramfs/fsck-bad-header-pad-4K-le index 8e2316183c..78c6bd2bae 100644 --- a/tests/expected/cramfs/fsck-bad-header-pad-4K-le +++ b/tests/expected/cramfs/fsck-bad-header-pad-4K-le @@ -1,29 +1,21 @@ ## size: 76 -fsck.cramfs: superblock size (76) too small ret: 4 ## size: 587 -fsck.cramfs: superblock size (587) too small ret: 4 ## size: 588 -fsck.cramfs: file extends past end of filesystem -fsck.cramfs: crc error ret: 4 ## size: 4095 -fsck.cramfs: file extends past end of filesystem -fsck.cramfs: crc error ret: 4 ## size: 4096 ret: 0 ## size: 4097 -fsck.cramfs: file length too short ret: 4 ## size: 4294967295 -fsck.cramfs: file length too short ret: 4 diff --git a/tests/expected/cramfs/fsck-bad-header-pad-4K-le.err b/tests/expected/cramfs/fsck-bad-header-pad-4K-le.err new file mode 100644 index 0000000000..27e45df5ed --- /dev/null +++ b/tests/expected/cramfs/fsck-bad-header-pad-4K-le.err @@ -0,0 +1,15 @@ +## size: 76 +fsck.cramfs: superblock size (76) too small +## size: 587 +fsck.cramfs: superblock size (587) too small +## size: 588 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +## size: 4095 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +## size: 4096 +## size: 4097 +fsck.cramfs: file length too short +## size: 4294967295 +fsck.cramfs: file length too short diff --git a/tests/expected/cramfs/fsck-bad-header-pad-64K-be b/tests/expected/cramfs/fsck-bad-header-pad-64K-be index 15d4ff1900..b9c559e982 100644 --- a/tests/expected/cramfs/fsck-bad-header-pad-64K-be +++ b/tests/expected/cramfs/fsck-bad-header-pad-64K-be @@ -1,29 +1,21 @@ ## size: 76 -fsck.cramfs: superblock size (76) too small ret: 4 ## size: 587 -fsck.cramfs: superblock size (587) too small ret: 4 ## size: 588 -fsck.cramfs: file extends past end of filesystem -fsck.cramfs: crc error ret: 4 ## size: 65535 -fsck.cramfs: file extends past end of filesystem -fsck.cramfs: crc error ret: 4 ## size: 65536 ret: 0 ## size: 65537 -fsck.cramfs: file length too short ret: 4 ## size: 4294967295 -fsck.cramfs: file length too short ret: 4 diff --git a/tests/expected/cramfs/fsck-bad-header-pad-64K-be.err b/tests/expected/cramfs/fsck-bad-header-pad-64K-be.err new file mode 100644 index 0000000000..817ba7b9a7 --- /dev/null +++ b/tests/expected/cramfs/fsck-bad-header-pad-64K-be.err @@ -0,0 +1,15 @@ +## size: 76 +fsck.cramfs: superblock size (76) too small +## size: 587 +fsck.cramfs: superblock size (587) too small +## size: 588 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +## size: 65535 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +## size: 65536 +## size: 65537 +fsck.cramfs: file length too short +## size: 4294967295 +fsck.cramfs: file length too short diff --git a/tests/expected/cramfs/fsck-bad-header-pad-64K-le b/tests/expected/cramfs/fsck-bad-header-pad-64K-le index 15d4ff1900..b9c559e982 100644 --- a/tests/expected/cramfs/fsck-bad-header-pad-64K-le +++ b/tests/expected/cramfs/fsck-bad-header-pad-64K-le @@ -1,29 +1,21 @@ ## size: 76 -fsck.cramfs: superblock size (76) too small ret: 4 ## size: 587 -fsck.cramfs: superblock size (587) too small ret: 4 ## size: 588 -fsck.cramfs: file extends past end of filesystem -fsck.cramfs: crc error ret: 4 ## size: 65535 -fsck.cramfs: file extends past end of filesystem -fsck.cramfs: crc error ret: 4 ## size: 65536 ret: 0 ## size: 65537 -fsck.cramfs: file length too short ret: 4 ## size: 4294967295 -fsck.cramfs: file length too short ret: 4 diff --git a/tests/expected/cramfs/fsck-bad-header-pad-64K-le.err b/tests/expected/cramfs/fsck-bad-header-pad-64K-le.err new file mode 100644 index 0000000000..817ba7b9a7 --- /dev/null +++ b/tests/expected/cramfs/fsck-bad-header-pad-64K-le.err @@ -0,0 +1,15 @@ +## size: 76 +fsck.cramfs: superblock size (76) too small +## size: 587 +fsck.cramfs: superblock size (587) too small +## size: 588 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +## size: 65535 +fsck.cramfs: file extends past end of filesystem +fsck.cramfs: crc error +## size: 65536 +## size: 65537 +fsck.cramfs: file length too short +## size: 4294967295 +fsck.cramfs: file length too short diff --git a/tests/expected/cramfs/fsck-bad-header.err b/tests/expected/cramfs/fsck-bad-header.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/fdisk/gpt-resize b/tests/expected/fdisk/gpt-resize index 2871f1a143..01e220e43d 100644 --- a/tests/expected/fdisk/gpt-resize +++ b/tests/expected/fdisk/gpt-resize @@ -15,33 +15,22 @@ Device Start End Sectors Size Type p1 2048 20446 18399 9M Linux filesystem The partition table has been altered. - - ----- fixing after resize: ----- - - Welcome to fdisk . Changes will remain in memory only, until you decide to write them. Be careful before using the write command. -GPT PMBR size mismatch (20479 != 40959) will be corrected by write. -The backup GPT table is not on the end of the device. This problem will be corrected by write. Command (m for help): Partition number (2-128, default 2): First sector (20447-40926, default 20480): Last sector, +/-sectors or +/-size{K,M,G,T,P} (20480-40926, default 40926): Created a new . Command (m for help): The partition table has been altered. Calling ioctl() to re-read partition table. -Re-reading the partition table failed.: Invalid argument The kernel still uses the old table. The new table will be used at the next reboot or after you run partprobe(8) or partx(8). - - ----- list result: ----- - - Disk : 20 MiB, 20971520 bytes, 40960 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/fdisk/gpt-resize.err b/tests/expected/fdisk/gpt-resize.err new file mode 100644 index 0000000000..8c8922493a --- /dev/null +++ b/tests/expected/fdisk/gpt-resize.err @@ -0,0 +1,4 @@ +----- fixing after resize: ----- +GPT PMBR size mismatch (20479 != 40959) will be corrected by write. +The backup GPT table is not on the end of the device. This problem will be corrected by write. +Re-reading the partition table failed.: Invalid argument diff --git a/tests/expected/fdisk/oddinput b/tests/expected/fdisk/oddinput index 219e98b67c..3391422d66 100644 --- a/tests/expected/fdisk/oddinput +++ b/tests/expected/fdisk/oddinput @@ -1,11 +1,7 @@ -Initialize empty image +---Initialize empty image f1c9645dbc14efddc7d8a322685f26eb oddinput.img -Empty image listing +---Empty image listing Disk testimage: 10 MiB, 10485760 bytes, 20480 sectors Units: cylinders of 16065 * 512 = 8225280 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / 512 bytes -Nonexistent file -fdisk: cannot open _a_file_that_does_not_exist_: ENOENT -Too small file -fdisk: cannot open oddinput.toosmall: ENOTTY diff --git a/tests/expected/fdisk/oddinput.err b/tests/expected/fdisk/oddinput.err new file mode 100644 index 0000000000..041fc7939d --- /dev/null +++ b/tests/expected/fdisk/oddinput.err @@ -0,0 +1,4 @@ +---Nonexistent file +fdisk: cannot open _a_file_that_does_not_exist_: ENOENT +---Too small file +fdisk: cannot open oddinput.toosmall: ENOTTY diff --git a/tests/expected/fincore/count.4096 b/tests/expected/fincore/count.4096 index 46651365a9..e90044c132 100644 --- a/tests/expected/fincore/count.4096 +++ b/tests/expected/fincore/count.4096 @@ -1,5 +1,4 @@ [ NO EXCITING FILE ] -fincore: failed to open: no_such_file: No such file or directory return value: 1 0 0 i_EMPTY_FILE return value: 0 @@ -34,7 +33,6 @@ return value: 0 1 134217728 i_WINDOW_SIZE_+_1_page_directio-sparse-incore_ return value: 0 [ MULTIPLE FILES ] -fincore: failed to open: no_such_file: No such file or directory PAGES SIZE FILE 0 0 i_EMPTY_FILE 1 4095 i_PAGESIZE_-1__incore_ diff --git a/tests/expected/fincore/count.65536 b/tests/expected/fincore/count.65536 index 0a9fab4553..22d6a08739 100644 --- a/tests/expected/fincore/count.65536 +++ b/tests/expected/fincore/count.65536 @@ -1,5 +1,4 @@ [ NO EXCITING FILE ] -fincore: failed to open: no_such_file: No such file or directory return value: 1 0 0 i_EMPTY_FILE return value: 0 @@ -34,7 +33,6 @@ return value: 0 1 2147483648 i_WINDOW_SIZE_+_1_page_directio-sparse-incore_ return value: 0 [ MULTIPLE FILES ] -fincore: failed to open: no_such_file: No such file or directory PAGES SIZE FILE 0 0 i_EMPTY_FILE 1 65535 i_PAGESIZE_-1__incore_ diff --git a/tests/expected/fincore/count.err.4096 b/tests/expected/fincore/count.err.4096 new file mode 100644 index 0000000000..e3fad01132 --- /dev/null +++ b/tests/expected/fincore/count.err.4096 @@ -0,0 +1,4 @@ +[ NO EXCITING FILE ] +fincore: failed to open: no_such_file: No such file or directory +[ MULTIPLE FILES ] +fincore: failed to open: no_such_file: No such file or directory diff --git a/tests/expected/fincore/count.err.65536 b/tests/expected/fincore/count.err.65536 new file mode 100644 index 0000000000..e3fad01132 --- /dev/null +++ b/tests/expected/fincore/count.err.65536 @@ -0,0 +1,4 @@ +[ NO EXCITING FILE ] +fincore: failed to open: no_such_file: No such file or directory +[ MULTIPLE FILES ] +fincore: failed to open: no_such_file: No such file or directory diff --git a/tests/expected/fincore/count.err.nosize b/tests/expected/fincore/count.err.nosize new file mode 100644 index 0000000000..e3fad01132 --- /dev/null +++ b/tests/expected/fincore/count.err.nosize @@ -0,0 +1,4 @@ +[ NO EXCITING FILE ] +fincore: failed to open: no_such_file: No such file or directory +[ MULTIPLE FILES ] +fincore: failed to open: no_such_file: No such file or directory diff --git a/tests/expected/fincore/count.nosize b/tests/expected/fincore/count.nosize index d5704451c8..6fdcea05b5 100644 --- a/tests/expected/fincore/count.nosize +++ b/tests/expected/fincore/count.nosize @@ -1,5 +1,4 @@ [ NO EXCITING FILE ] -fincore: failed to open: no_such_file: No such file or directory return value: 1 0 i_EMPTY_FILE return value: 0 @@ -34,7 +33,6 @@ return value: 0 1 i_WINDOW_SIZE_+_1_page_directio-sparse-incore_ return value: 0 [ MULTIPLE FILES ] -fincore: failed to open: no_such_file: No such file or directory PAGES FILE 0 i_EMPTY_FILE 1 i_PAGESIZE_-1__incore_ diff --git a/tests/expected/getopt/basic.err b/tests/expected/getopt/basic.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-alternative_option_clash.err b/tests/expected/getopt/options-alternative_option_clash.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-alternative_option_long.err b/tests/expected/getopt/options-alternative_option_long.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-alternative_option_short.err b/tests/expected/getopt/options-alternative_option_short.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-compatible b/tests/expected/getopt/options-compatible index 66e42a7b51..f3df58df3f 100644 --- a/tests/expected/getopt/options-compatible +++ b/tests/expected/getopt/options-compatible @@ -1,5 +1,3 @@ -getopt: missing optstring argument -Try 'getopt --help' for more information. exit value: 2 -- exit value: 0 diff --git a/tests/expected/getopt/options-compatible.err b/tests/expected/getopt/options-compatible.err new file mode 100644 index 0000000000..d2c01b7bf3 --- /dev/null +++ b/tests/expected/getopt/options-compatible.err @@ -0,0 +1,2 @@ +getopt: missing optstring argument +Try 'getopt --help' for more information. diff --git a/tests/expected/getopt/options-csh.err b/tests/expected/getopt/options-csh.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-invalid_getopt_option b/tests/expected/getopt/options-invalid_getopt_option index b3577e027a..0af0d83ff5 100644 --- a/tests/expected/getopt/options-invalid_getopt_option +++ b/tests/expected/getopt/options-invalid_getopt_option @@ -1,3 +1 @@ -getopt: invalid option -- 'b' -Try 'getopt --help' for more information. exit value: 2 diff --git a/tests/expected/getopt/options-invalid_getopt_option.err b/tests/expected/getopt/options-invalid_getopt_option.err new file mode 100644 index 0000000000..48ce3c5972 --- /dev/null +++ b/tests/expected/getopt/options-invalid_getopt_option.err @@ -0,0 +1,2 @@ +/home/projects/util-linux/util-linux/getopt: invalid option -- 'b' +Try 'getopt --help' for more information. diff --git a/tests/expected/getopt/options-invocation_model_one.err b/tests/expected/getopt/options-invocation_model_one.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-invocation_model_three_as_one.err b/tests/expected/getopt/options-invocation_model_three_as_one.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-invocation_model_two_as_one.err b/tests/expected/getopt/options-invocation_model_two_as_one.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-invocation_without_parameters b/tests/expected/getopt/options-invocation_without_parameters index f1ecc16107..0af0d83ff5 100644 --- a/tests/expected/getopt/options-invocation_without_parameters +++ b/tests/expected/getopt/options-invocation_without_parameters @@ -1,3 +1 @@ -getopt: missing optstring argument -Try 'getopt --help' for more information. exit value: 2 diff --git a/tests/expected/getopt/options-invocation_without_parameters.err b/tests/expected/getopt/options-invocation_without_parameters.err new file mode 100644 index 0000000000..d2c01b7bf3 --- /dev/null +++ b/tests/expected/getopt/options-invocation_without_parameters.err @@ -0,0 +1,2 @@ +getopt: missing optstring argument +Try 'getopt --help' for more information. diff --git a/tests/expected/getopt/options-long_option_ambiguous_1 b/tests/expected/getopt/options-long_option_ambiguous_1 index c8cfbb3d90..3e1a9672a0 100644 --- a/tests/expected/getopt/options-long_option_ambiguous_1 +++ b/tests/expected/getopt/options-long_option_ambiguous_1 @@ -1,3 +1,2 @@ -getopt: option '--long' is ambiguous; possibilities: '--long1' '--long2' -- exit value: 1 diff --git a/tests/expected/getopt/options-long_option_ambiguous_1.err b/tests/expected/getopt/options-long_option_ambiguous_1.err new file mode 100644 index 0000000000..7739c76990 --- /dev/null +++ b/tests/expected/getopt/options-long_option_ambiguous_1.err @@ -0,0 +1 @@ +/home/projects/util-linux/util-linux/getopt: option '--long' is ambiguous; possibilities: '--long1' '--long2' diff --git a/tests/expected/getopt/options-longopts.err b/tests/expected/getopt/options-longopts.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-name_option_long b/tests/expected/getopt/options-name_option_long index 60b9e6b7b4..5538e168cc 100644 --- a/tests/expected/getopt/options-name_option_long +++ b/tests/expected/getopt/options-name_option_long @@ -1,4 +1,2 @@ -THIS_PROGRAM: invalid option -- 'b' -THIS_PROGRAM: unrecognized option '--whatever' --long -a -- exit value: 1 diff --git a/tests/expected/getopt/options-name_option_long.err b/tests/expected/getopt/options-name_option_long.err new file mode 100644 index 0000000000..140ce709a4 --- /dev/null +++ b/tests/expected/getopt/options-name_option_long.err @@ -0,0 +1,2 @@ +THIS_PROGRAM: invalid option -- 'b' +THIS_PROGRAM: unrecognized option '--whatever' diff --git a/tests/expected/getopt/options-name_option_short b/tests/expected/getopt/options-name_option_short index 60b9e6b7b4..5538e168cc 100644 --- a/tests/expected/getopt/options-name_option_short +++ b/tests/expected/getopt/options-name_option_short @@ -1,4 +1,2 @@ -THIS_PROGRAM: invalid option -- 'b' -THIS_PROGRAM: unrecognized option '--whatever' --long -a -- exit value: 1 diff --git a/tests/expected/getopt/options-name_option_short.err b/tests/expected/getopt/options-name_option_short.err new file mode 100644 index 0000000000..140ce709a4 --- /dev/null +++ b/tests/expected/getopt/options-name_option_short.err @@ -0,0 +1,2 @@ +THIS_PROGRAM: invalid option -- 'b' +THIS_PROGRAM: unrecognized option '--whatever' diff --git a/tests/expected/getopt/options-no-arguments b/tests/expected/getopt/options-no-arguments index f1ecc16107..0af0d83ff5 100644 --- a/tests/expected/getopt/options-no-arguments +++ b/tests/expected/getopt/options-no-arguments @@ -1,3 +1 @@ -getopt: missing optstring argument -Try 'getopt --help' for more information. exit value: 2 diff --git a/tests/expected/getopt/options-no-arguments.err b/tests/expected/getopt/options-no-arguments.err new file mode 100644 index 0000000000..d2c01b7bf3 --- /dev/null +++ b/tests/expected/getopt/options-no-arguments.err @@ -0,0 +1,2 @@ +getopt: missing optstring argument +Try 'getopt --help' for more information. diff --git a/tests/expected/getopt/options-non-option.err b/tests/expected/getopt/options-non-option.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-posix_correctly.err b/tests/expected/getopt/options-posix_correctly.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-quiet_option_long.err b/tests/expected/getopt/options-quiet_option_long.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-quiet_option_short.err b/tests/expected/getopt/options-quiet_option_short.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-quiet_output_option_long b/tests/expected/getopt/options-quiet_output_option_long index 3e05ca7df5..9e52cd9495 100644 --- a/tests/expected/getopt/options-quiet_output_option_long +++ b/tests/expected/getopt/options-quiet_output_option_long @@ -1,5 +1 @@ -getopt: invalid option -- 'c' -getopt: unrecognized option '--unknown' -getopt: option '--long' is ambiguous; possibilities: '--long1' '--long2' -getopt: option requires an argument -- 'b' exit value: 1 diff --git a/tests/expected/getopt/options-quiet_output_option_long.err b/tests/expected/getopt/options-quiet_output_option_long.err new file mode 100644 index 0000000000..58884308d4 --- /dev/null +++ b/tests/expected/getopt/options-quiet_output_option_long.err @@ -0,0 +1,4 @@ +/home/projects/util-linux/util-linux/getopt: invalid option -- 'c' +/home/projects/util-linux/util-linux/getopt: unrecognized option '--unknown' +/home/projects/util-linux/util-linux/getopt: option '--long' is ambiguous; possibilities: '--long1' '--long2' +/home/projects/util-linux/util-linux/getopt: option requires an argument -- 'b' diff --git a/tests/expected/getopt/options-quiet_output_option_short b/tests/expected/getopt/options-quiet_output_option_short index 3e05ca7df5..9e52cd9495 100644 --- a/tests/expected/getopt/options-quiet_output_option_short +++ b/tests/expected/getopt/options-quiet_output_option_short @@ -1,5 +1 @@ -getopt: invalid option -- 'c' -getopt: unrecognized option '--unknown' -getopt: option '--long' is ambiguous; possibilities: '--long1' '--long2' -getopt: option requires an argument -- 'b' exit value: 1 diff --git a/tests/expected/getopt/options-quiet_output_option_short.err b/tests/expected/getopt/options-quiet_output_option_short.err new file mode 100644 index 0000000000..58884308d4 --- /dev/null +++ b/tests/expected/getopt/options-quiet_output_option_short.err @@ -0,0 +1,4 @@ +/home/projects/util-linux/util-linux/getopt: invalid option -- 'c' +/home/projects/util-linux/util-linux/getopt: unrecognized option '--unknown' +/home/projects/util-linux/util-linux/getopt: option '--long' is ambiguous; possibilities: '--long1' '--long2' +/home/projects/util-linux/util-linux/getopt: option requires an argument -- 'b' diff --git a/tests/expected/getopt/options-same_long_short_options.err b/tests/expected/getopt/options-same_long_short_options.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-sh.err b/tests/expected/getopt/options-sh.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-test_for_enhanced_getopt.err b/tests/expected/getopt/options-test_for_enhanced_getopt.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-unknown_options b/tests/expected/getopt/options-unknown_options index 6edba2b777..5538e168cc 100644 --- a/tests/expected/getopt/options-unknown_options +++ b/tests/expected/getopt/options-unknown_options @@ -1,4 +1,2 @@ -getopt: invalid option -- 'b' -getopt: unrecognized option '--whatever' --long -a -- exit value: 1 diff --git a/tests/expected/getopt/options-unknown_options.err b/tests/expected/getopt/options-unknown_options.err new file mode 100644 index 0000000000..1c0518bbd2 --- /dev/null +++ b/tests/expected/getopt/options-unknown_options.err @@ -0,0 +1,2 @@ +/home/projects/util-linux/util-linux/getopt: invalid option -- 'b' +/home/projects/util-linux/util-linux/getopt: unrecognized option '--whatever' diff --git a/tests/expected/getopt/options-unquoted_option_bash.err b/tests/expected/getopt/options-unquoted_option_bash.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-unquoted_option_tcsh.err b/tests/expected/getopt/options-unquoted_option_tcsh.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-weird_quoting_bash.err b/tests/expected/getopt/options-weird_quoting_bash.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options-weird_quoting_tcsh.err b/tests/expected/getopt/options-weird_quoting_tcsh.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/getopt/options.err b/tests/expected/getopt/options.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/kill/all_processes b/tests/expected/kill/all_processes index f14549fd4a..241483b40a 100644 --- a/tests/expected/kill/all_processes +++ b/tests/expected/kill/all_processes @@ -1,5 +1,3 @@ test 1 -kill: cannot find process "test_sigreceive" test 2 test 3 -kill: cannot find process "test_sigreceive" diff --git a/tests/expected/kill/all_processes.err b/tests/expected/kill/all_processes.err new file mode 100644 index 0000000000..f14549fd4a --- /dev/null +++ b/tests/expected/kill/all_processes.err @@ -0,0 +1,5 @@ +test 1 +kill: cannot find process "test_sigreceive" +test 2 +test 3 +kill: cannot find process "test_sigreceive" diff --git a/tests/expected/logger/errors-check_socket.err b/tests/expected/logger/errors-check_socket.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/logger/errors-id_with_space b/tests/expected/logger/errors-id_with_space index 0f3bc4576f..3a5a574673 100644 --- a/tests/expected/logger/errors-id_with_space +++ b/tests/expected/logger/errors-id_with_space @@ -1,10 +1,5 @@ -test_logger: failed to parse id: 'A B' ret: 1 -test_logger: failed to parse id: 'A B' ret: 1 -test_logger: failed to parse id: '1 23' ret: 1 -<13>Feb 13 23:31:30 id_with_leading space[123]: message ret: 0 -test_logger: failed to parse id: '123 ' ret: 1 diff --git a/tests/expected/logger/errors-id_with_space.err b/tests/expected/logger/errors-id_with_space.err new file mode 100644 index 0000000000..23a3cbcde4 --- /dev/null +++ b/tests/expected/logger/errors-id_with_space.err @@ -0,0 +1,5 @@ +test_logger: failed to parse id: 'A B' +test_logger: failed to parse id: 'A B' +test_logger: failed to parse id: '1 23' +<13>Feb 13 23:31:30 id_with_leading space[123]: message +test_logger: failed to parse id: '123 ' diff --git a/tests/expected/logger/errors-invalid_prio b/tests/expected/logger/errors-invalid_prio index 7e3aa96333..596150b9d0 100644 --- a/tests/expected/logger/errors-invalid_prio +++ b/tests/expected/logger/errors-invalid_prio @@ -1,2 +1 @@ -test_logger: unknown priority name: 8 ret: 1 diff --git a/tests/expected/logger/errors-invalid_prio.err b/tests/expected/logger/errors-invalid_prio.err new file mode 100644 index 0000000000..cf79cf388f --- /dev/null +++ b/tests/expected/logger/errors-invalid_prio.err @@ -0,0 +1 @@ +test_logger: unknown priority name: 8 diff --git a/tests/expected/logger/errors-invalid_socket b/tests/expected/logger/errors-invalid_socket index 5720afac64..596150b9d0 100644 --- a/tests/expected/logger/errors-invalid_socket +++ b/tests/expected/logger/errors-invalid_socket @@ -1,2 +1 @@ -test_logger: socket /bad/boy: No such file or directory ret: 1 diff --git a/tests/expected/logger/errors-invalid_socket.err b/tests/expected/logger/errors-invalid_socket.err new file mode 100644 index 0000000000..4a0421ac82 --- /dev/null +++ b/tests/expected/logger/errors-invalid_socket.err @@ -0,0 +1 @@ +test_logger: socket /bad/boy: No such file or directory diff --git a/tests/expected/logger/errors-kern_priority b/tests/expected/logger/errors-kern_priority index 5b372abca5..0f2938d9f5 100644 --- a/tests/expected/logger/errors-kern_priority +++ b/tests/expected/logger/errors-kern_priority @@ -1,2 +1 @@ -<8>Feb 13 23:31:30 prio: message ret: 0 diff --git a/tests/expected/logger/errors-kern_priority.err b/tests/expected/logger/errors-kern_priority.err new file mode 100644 index 0000000000..6656db089a --- /dev/null +++ b/tests/expected/logger/errors-kern_priority.err @@ -0,0 +1 @@ +<8>Feb 13 23:31:30 prio: message diff --git a/tests/expected/logger/errors-kern_priority_numeric b/tests/expected/logger/errors-kern_priority_numeric index 5b372abca5..0f2938d9f5 100644 --- a/tests/expected/logger/errors-kern_priority_numeric +++ b/tests/expected/logger/errors-kern_priority_numeric @@ -1,2 +1 @@ -<8>Feb 13 23:31:30 prio: message ret: 0 diff --git a/tests/expected/logger/errors-kern_priority_numeric.err b/tests/expected/logger/errors-kern_priority_numeric.err new file mode 100644 index 0000000000..6656db089a --- /dev/null +++ b/tests/expected/logger/errors-kern_priority_numeric.err @@ -0,0 +1 @@ +<8>Feb 13 23:31:30 prio: message diff --git a/tests/expected/logger/errors-multi-line b/tests/expected/logger/errors-multi-line index 5247589465..0f2938d9f5 100644 --- a/tests/expected/logger/errors-multi-line +++ b/tests/expected/logger/errors-multi-line @@ -1,4 +1 @@ -<13>Feb 13 23:31:30 multi: AAA -<13>Feb 13 23:31:30 multi: BBB -<13>Feb 13 23:31:30 multi: CCC ret: 0 diff --git a/tests/expected/logger/errors-multi-line.err b/tests/expected/logger/errors-multi-line.err new file mode 100644 index 0000000000..d015bad099 --- /dev/null +++ b/tests/expected/logger/errors-multi-line.err @@ -0,0 +1,3 @@ +<13>Feb 13 23:31:30 multi: AAA +<13>Feb 13 23:31:30 multi: BBB +<13>Feb 13 23:31:30 multi: CCC diff --git a/tests/expected/logger/errors-rfc5424_exceed_size b/tests/expected/logger/errors-rfc5424_exceed_size index be205edd50..0f2938d9f5 100644 --- a/tests/expected/logger/errors-rfc5424_exceed_size +++ b/tests/expected/logger/errors-rfc5424_exceed_size @@ -1,2 +1 @@ -<13>1 2009-02-13T23:31:30.123456+00:00 test-hostname rfc5424_exceed_size - - [timeQuality tzKnown="1" isSynced="0"] abc ret: 0 diff --git a/tests/expected/logger/errors-rfc5424_exceed_size.err b/tests/expected/logger/errors-rfc5424_exceed_size.err new file mode 100644 index 0000000000..91f69b62a8 --- /dev/null +++ b/tests/expected/logger/errors-rfc5424_exceed_size.err @@ -0,0 +1 @@ +<13>1 2009-02-13T23:31:30.123456+00:00 test-hostname rfc5424_exceed_size - - [timeQuality tzKnown="1" isSynced="0"] abc diff --git a/tests/expected/logger/errors-rfc5424_msgid_with_space b/tests/expected/logger/errors-rfc5424_msgid_with_space index ad8bd297e1..596150b9d0 100644 --- a/tests/expected/logger/errors-rfc5424_msgid_with_space +++ b/tests/expected/logger/errors-rfc5424_msgid_with_space @@ -1,2 +1 @@ -test_logger: --msgid cannot contain space ret: 1 diff --git a/tests/expected/logger/errors-rfc5424_msgid_with_space.err b/tests/expected/logger/errors-rfc5424_msgid_with_space.err new file mode 100644 index 0000000000..273bc9b659 --- /dev/null +++ b/tests/expected/logger/errors-rfc5424_msgid_with_space.err @@ -0,0 +1 @@ +test_logger: --msgid cannot contain space diff --git a/tests/expected/logger/errors-tag_with_space b/tests/expected/logger/errors-tag_with_space index 712bdccdc8..794fe340cb 100644 --- a/tests/expected/logger/errors-tag_with_space +++ b/tests/expected/logger/errors-tag_with_space @@ -1,4 +1,2 @@ -<13>Feb 13 23:31:30 A B: tag_with_space ret: 0 -<13>1 2009-02-13T23:31:30.123456+00:00 test-hostname A B - - [timeQuality tzKnown="1" isSynced="0"] tag_with_space_rfc5424 ret: 0 diff --git a/tests/expected/logger/errors-tag_with_space.err b/tests/expected/logger/errors-tag_with_space.err new file mode 100644 index 0000000000..9821d82c0d --- /dev/null +++ b/tests/expected/logger/errors-tag_with_space.err @@ -0,0 +1,2 @@ +<13>Feb 13 23:31:30 A B: tag_with_space +<13>1 2009-02-13T23:31:30.123456+00:00 test-hostname A B - - [timeQuality tzKnown="1" isSynced="0"] tag_with_space_rfc5424 diff --git a/tests/expected/logger/errors-tcp b/tests/expected/logger/errors-tcp index f66dc99b85..0f2938d9f5 100644 --- a/tests/expected/logger/errors-tcp +++ b/tests/expected/logger/errors-tcp @@ -1,2 +1 @@ -<13>Feb 13 23:31:30 tcp: message ret: 0 diff --git a/tests/expected/logger/errors-tcp.err b/tests/expected/logger/errors-tcp.err new file mode 100644 index 0000000000..4f77de3ee8 --- /dev/null +++ b/tests/expected/logger/errors-tcp.err @@ -0,0 +1 @@ +<13>Feb 13 23:31:30 tcp: message diff --git a/tests/expected/logger/formats-check_socket b/tests/expected/logger/formats-check_socket index fa36c4e5be..e69de29bb2 100644 --- a/tests/expected/logger/formats-check_socket +++ b/tests/expected/logger/formats-check_socket @@ -1 +0,0 @@ -Check written socket data of all subtests. diff --git a/tests/expected/logger/formats-check_socket.err b/tests/expected/logger/formats-check_socket.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/logger/formats-octet_counting b/tests/expected/logger/formats-octet_counting index 6b18824b1c..e69de29bb2 100644 --- a/tests/expected/logger/formats-octet_counting +++ b/tests/expected/logger/formats-octet_counting @@ -1,2 +0,0 @@ -34 <13>Feb 13 23:31:30 octen: message -ret: 0 diff --git a/tests/expected/logger/formats-octet_counting.err b/tests/expected/logger/formats-octet_counting.err new file mode 100644 index 0000000000..6b18824b1c --- /dev/null +++ b/tests/expected/logger/formats-octet_counting.err @@ -0,0 +1,2 @@ +34 <13>Feb 13 23:31:30 octen: message +ret: 0 diff --git a/tests/expected/logger/formats-priorities b/tests/expected/logger/formats-priorities index 462e90f229..e69de29bb2 100644 --- a/tests/expected/logger/formats-priorities +++ b/tests/expected/logger/formats-priorities @@ -1,304 +0,0 @@ -<32>Feb 13 23:31:30 prio: auth.emerg -ret: 0 -<33>Feb 13 23:31:30 prio: auth.alert -ret: 0 -<34>Feb 13 23:31:30 prio: auth.crit -ret: 0 -<35>Feb 13 23:31:30 prio: auth.err -ret: 0 -<36>Feb 13 23:31:30 prio: auth.warning -ret: 0 -<37>Feb 13 23:31:30 prio: auth.notice -ret: 0 -<38>Feb 13 23:31:30 prio: auth.info -ret: 0 -<39>Feb 13 23:31:30 prio: auth.debug -ret: 0 -<80>Feb 13 23:31:30 prio: authpriv.emerg -ret: 0 -<81>Feb 13 23:31:30 prio: authpriv.alert -ret: 0 -<82>Feb 13 23:31:30 prio: authpriv.crit -ret: 0 -<83>Feb 13 23:31:30 prio: authpriv.err -ret: 0 -<84>Feb 13 23:31:30 prio: authpriv.warning -ret: 0 -<85>Feb 13 23:31:30 prio: authpriv.notice -ret: 0 -<86>Feb 13 23:31:30 prio: authpriv.info -ret: 0 -<87>Feb 13 23:31:30 prio: authpriv.debug -ret: 0 -<72>Feb 13 23:31:30 prio: cron.emerg -ret: 0 -<73>Feb 13 23:31:30 prio: cron.alert -ret: 0 -<74>Feb 13 23:31:30 prio: cron.crit -ret: 0 -<75>Feb 13 23:31:30 prio: cron.err -ret: 0 -<76>Feb 13 23:31:30 prio: cron.warning -ret: 0 -<77>Feb 13 23:31:30 prio: cron.notice -ret: 0 -<78>Feb 13 23:31:30 prio: cron.info -ret: 0 -<79>Feb 13 23:31:30 prio: cron.debug -ret: 0 -<24>Feb 13 23:31:30 prio: daemon.emerg -ret: 0 -<25>Feb 13 23:31:30 prio: daemon.alert -ret: 0 -<26>Feb 13 23:31:30 prio: daemon.crit -ret: 0 -<27>Feb 13 23:31:30 prio: daemon.err -ret: 0 -<28>Feb 13 23:31:30 prio: daemon.warning -ret: 0 -<29>Feb 13 23:31:30 prio: daemon.notice -ret: 0 -<30>Feb 13 23:31:30 prio: daemon.info -ret: 0 -<31>Feb 13 23:31:30 prio: daemon.debug -ret: 0 -<88>Feb 13 23:31:30 prio: ftp.emerg -ret: 0 -<89>Feb 13 23:31:30 prio: ftp.alert -ret: 0 -<90>Feb 13 23:31:30 prio: ftp.crit -ret: 0 -<91>Feb 13 23:31:30 prio: ftp.err -ret: 0 -<92>Feb 13 23:31:30 prio: ftp.warning -ret: 0 -<93>Feb 13 23:31:30 prio: ftp.notice -ret: 0 -<94>Feb 13 23:31:30 prio: ftp.info -ret: 0 -<95>Feb 13 23:31:30 prio: ftp.debug -ret: 0 -<48>Feb 13 23:31:30 prio: lpr.emerg -ret: 0 -<49>Feb 13 23:31:30 prio: lpr.alert -ret: 0 -<50>Feb 13 23:31:30 prio: lpr.crit -ret: 0 -<51>Feb 13 23:31:30 prio: lpr.err -ret: 0 -<52>Feb 13 23:31:30 prio: lpr.warning -ret: 0 -<53>Feb 13 23:31:30 prio: lpr.notice -ret: 0 -<54>Feb 13 23:31:30 prio: lpr.info -ret: 0 -<55>Feb 13 23:31:30 prio: lpr.debug -ret: 0 -<16>Feb 13 23:31:30 prio: mail.emerg -ret: 0 -<17>Feb 13 23:31:30 prio: mail.alert -ret: 0 -<18>Feb 13 23:31:30 prio: mail.crit -ret: 0 -<19>Feb 13 23:31:30 prio: mail.err -ret: 0 -<20>Feb 13 23:31:30 prio: mail.warning -ret: 0 -<21>Feb 13 23:31:30 prio: mail.notice -ret: 0 -<22>Feb 13 23:31:30 prio: mail.info -ret: 0 -<23>Feb 13 23:31:30 prio: mail.debug -ret: 0 -<56>Feb 13 23:31:30 prio: news.emerg -ret: 0 -<57>Feb 13 23:31:30 prio: news.alert -ret: 0 -<58>Feb 13 23:31:30 prio: news.crit -ret: 0 -<59>Feb 13 23:31:30 prio: news.err -ret: 0 -<60>Feb 13 23:31:30 prio: news.warning -ret: 0 -<61>Feb 13 23:31:30 prio: news.notice -ret: 0 -<62>Feb 13 23:31:30 prio: news.info -ret: 0 -<63>Feb 13 23:31:30 prio: news.debug -ret: 0 -<40>Feb 13 23:31:30 prio: syslog.emerg -ret: 0 -<41>Feb 13 23:31:30 prio: syslog.alert -ret: 0 -<42>Feb 13 23:31:30 prio: syslog.crit -ret: 0 -<43>Feb 13 23:31:30 prio: syslog.err -ret: 0 -<44>Feb 13 23:31:30 prio: syslog.warning -ret: 0 -<45>Feb 13 23:31:30 prio: syslog.notice -ret: 0 -<46>Feb 13 23:31:30 prio: syslog.info -ret: 0 -<47>Feb 13 23:31:30 prio: syslog.debug -ret: 0 -<8>Feb 13 23:31:30 prio: user.emerg -ret: 0 -<9>Feb 13 23:31:30 prio: user.alert -ret: 0 -<10>Feb 13 23:31:30 prio: user.crit -ret: 0 -<11>Feb 13 23:31:30 prio: user.err -ret: 0 -<12>Feb 13 23:31:30 prio: user.warning -ret: 0 -<13>Feb 13 23:31:30 prio: user.notice -ret: 0 -<14>Feb 13 23:31:30 prio: user.info -ret: 0 -<15>Feb 13 23:31:30 prio: user.debug -ret: 0 -<64>Feb 13 23:31:30 prio: uucp.emerg -ret: 0 -<65>Feb 13 23:31:30 prio: uucp.alert -ret: 0 -<66>Feb 13 23:31:30 prio: uucp.crit -ret: 0 -<67>Feb 13 23:31:30 prio: uucp.err -ret: 0 -<68>Feb 13 23:31:30 prio: uucp.warning -ret: 0 -<69>Feb 13 23:31:30 prio: uucp.notice -ret: 0 -<70>Feb 13 23:31:30 prio: uucp.info -ret: 0 -<71>Feb 13 23:31:30 prio: uucp.debug -ret: 0 -<128>Feb 13 23:31:30 prio: local0.emerg -ret: 0 -<129>Feb 13 23:31:30 prio: local0.alert -ret: 0 -<130>Feb 13 23:31:30 prio: local0.crit -ret: 0 -<131>Feb 13 23:31:30 prio: local0.err -ret: 0 -<132>Feb 13 23:31:30 prio: local0.warning -ret: 0 -<133>Feb 13 23:31:30 prio: local0.notice -ret: 0 -<134>Feb 13 23:31:30 prio: local0.info -ret: 0 -<135>Feb 13 23:31:30 prio: local0.debug -ret: 0 -<136>Feb 13 23:31:30 prio: local1.emerg -ret: 0 -<137>Feb 13 23:31:30 prio: local1.alert -ret: 0 -<138>Feb 13 23:31:30 prio: local1.crit -ret: 0 -<139>Feb 13 23:31:30 prio: local1.err -ret: 0 -<140>Feb 13 23:31:30 prio: local1.warning -ret: 0 -<141>Feb 13 23:31:30 prio: local1.notice -ret: 0 -<142>Feb 13 23:31:30 prio: local1.info -ret: 0 -<143>Feb 13 23:31:30 prio: local1.debug -ret: 0 -<144>Feb 13 23:31:30 prio: local2.emerg -ret: 0 -<145>Feb 13 23:31:30 prio: local2.alert -ret: 0 -<146>Feb 13 23:31:30 prio: local2.crit -ret: 0 -<147>Feb 13 23:31:30 prio: local2.err -ret: 0 -<148>Feb 13 23:31:30 prio: local2.warning -ret: 0 -<149>Feb 13 23:31:30 prio: local2.notice -ret: 0 -<150>Feb 13 23:31:30 prio: local2.info -ret: 0 -<151>Feb 13 23:31:30 prio: local2.debug -ret: 0 -<152>Feb 13 23:31:30 prio: local3.emerg -ret: 0 -<153>Feb 13 23:31:30 prio: local3.alert -ret: 0 -<154>Feb 13 23:31:30 prio: local3.crit -ret: 0 -<155>Feb 13 23:31:30 prio: local3.err -ret: 0 -<156>Feb 13 23:31:30 prio: local3.warning -ret: 0 -<157>Feb 13 23:31:30 prio: local3.notice -ret: 0 -<158>Feb 13 23:31:30 prio: local3.info -ret: 0 -<159>Feb 13 23:31:30 prio: local3.debug -ret: 0 -<160>Feb 13 23:31:30 prio: local4.emerg -ret: 0 -<161>Feb 13 23:31:30 prio: local4.alert -ret: 0 -<162>Feb 13 23:31:30 prio: local4.crit -ret: 0 -<163>Feb 13 23:31:30 prio: local4.err -ret: 0 -<164>Feb 13 23:31:30 prio: local4.warning -ret: 0 -<165>Feb 13 23:31:30 prio: local4.notice -ret: 0 -<166>Feb 13 23:31:30 prio: local4.info -ret: 0 -<167>Feb 13 23:31:30 prio: local4.debug -ret: 0 -<168>Feb 13 23:31:30 prio: local5.emerg -ret: 0 -<169>Feb 13 23:31:30 prio: local5.alert -ret: 0 -<170>Feb 13 23:31:30 prio: local5.crit -ret: 0 -<171>Feb 13 23:31:30 prio: local5.err -ret: 0 -<172>Feb 13 23:31:30 prio: local5.warning -ret: 0 -<173>Feb 13 23:31:30 prio: local5.notice -ret: 0 -<174>Feb 13 23:31:30 prio: local5.info -ret: 0 -<175>Feb 13 23:31:30 prio: local5.debug -ret: 0 -<176>Feb 13 23:31:30 prio: local6.emerg -ret: 0 -<177>Feb 13 23:31:30 prio: local6.alert -ret: 0 -<178>Feb 13 23:31:30 prio: local6.crit -ret: 0 -<179>Feb 13 23:31:30 prio: local6.err -ret: 0 -<180>Feb 13 23:31:30 prio: local6.warning -ret: 0 -<181>Feb 13 23:31:30 prio: local6.notice -ret: 0 -<182>Feb 13 23:31:30 prio: local6.info -ret: 0 -<183>Feb 13 23:31:30 prio: local6.debug -ret: 0 -<184>Feb 13 23:31:30 prio: local7.emerg -ret: 0 -<185>Feb 13 23:31:30 prio: local7.alert -ret: 0 -<186>Feb 13 23:31:30 prio: local7.crit -ret: 0 -<187>Feb 13 23:31:30 prio: local7.err -ret: 0 -<188>Feb 13 23:31:30 prio: local7.warning -ret: 0 -<189>Feb 13 23:31:30 prio: local7.notice -ret: 0 -<190>Feb 13 23:31:30 prio: local7.info -ret: 0 -<191>Feb 13 23:31:30 prio: local7.debug -ret: 0 diff --git a/tests/expected/logger/formats-priorities.err b/tests/expected/logger/formats-priorities.err new file mode 100644 index 0000000000..462e90f229 --- /dev/null +++ b/tests/expected/logger/formats-priorities.err @@ -0,0 +1,304 @@ +<32>Feb 13 23:31:30 prio: auth.emerg +ret: 0 +<33>Feb 13 23:31:30 prio: auth.alert +ret: 0 +<34>Feb 13 23:31:30 prio: auth.crit +ret: 0 +<35>Feb 13 23:31:30 prio: auth.err +ret: 0 +<36>Feb 13 23:31:30 prio: auth.warning +ret: 0 +<37>Feb 13 23:31:30 prio: auth.notice +ret: 0 +<38>Feb 13 23:31:30 prio: auth.info +ret: 0 +<39>Feb 13 23:31:30 prio: auth.debug +ret: 0 +<80>Feb 13 23:31:30 prio: authpriv.emerg +ret: 0 +<81>Feb 13 23:31:30 prio: authpriv.alert +ret: 0 +<82>Feb 13 23:31:30 prio: authpriv.crit +ret: 0 +<83>Feb 13 23:31:30 prio: authpriv.err +ret: 0 +<84>Feb 13 23:31:30 prio: authpriv.warning +ret: 0 +<85>Feb 13 23:31:30 prio: authpriv.notice +ret: 0 +<86>Feb 13 23:31:30 prio: authpriv.info +ret: 0 +<87>Feb 13 23:31:30 prio: authpriv.debug +ret: 0 +<72>Feb 13 23:31:30 prio: cron.emerg +ret: 0 +<73>Feb 13 23:31:30 prio: cron.alert +ret: 0 +<74>Feb 13 23:31:30 prio: cron.crit +ret: 0 +<75>Feb 13 23:31:30 prio: cron.err +ret: 0 +<76>Feb 13 23:31:30 prio: cron.warning +ret: 0 +<77>Feb 13 23:31:30 prio: cron.notice +ret: 0 +<78>Feb 13 23:31:30 prio: cron.info +ret: 0 +<79>Feb 13 23:31:30 prio: cron.debug +ret: 0 +<24>Feb 13 23:31:30 prio: daemon.emerg +ret: 0 +<25>Feb 13 23:31:30 prio: daemon.alert +ret: 0 +<26>Feb 13 23:31:30 prio: daemon.crit +ret: 0 +<27>Feb 13 23:31:30 prio: daemon.err +ret: 0 +<28>Feb 13 23:31:30 prio: daemon.warning +ret: 0 +<29>Feb 13 23:31:30 prio: daemon.notice +ret: 0 +<30>Feb 13 23:31:30 prio: daemon.info +ret: 0 +<31>Feb 13 23:31:30 prio: daemon.debug +ret: 0 +<88>Feb 13 23:31:30 prio: ftp.emerg +ret: 0 +<89>Feb 13 23:31:30 prio: ftp.alert +ret: 0 +<90>Feb 13 23:31:30 prio: ftp.crit +ret: 0 +<91>Feb 13 23:31:30 prio: ftp.err +ret: 0 +<92>Feb 13 23:31:30 prio: ftp.warning +ret: 0 +<93>Feb 13 23:31:30 prio: ftp.notice +ret: 0 +<94>Feb 13 23:31:30 prio: ftp.info +ret: 0 +<95>Feb 13 23:31:30 prio: ftp.debug +ret: 0 +<48>Feb 13 23:31:30 prio: lpr.emerg +ret: 0 +<49>Feb 13 23:31:30 prio: lpr.alert +ret: 0 +<50>Feb 13 23:31:30 prio: lpr.crit +ret: 0 +<51>Feb 13 23:31:30 prio: lpr.err +ret: 0 +<52>Feb 13 23:31:30 prio: lpr.warning +ret: 0 +<53>Feb 13 23:31:30 prio: lpr.notice +ret: 0 +<54>Feb 13 23:31:30 prio: lpr.info +ret: 0 +<55>Feb 13 23:31:30 prio: lpr.debug +ret: 0 +<16>Feb 13 23:31:30 prio: mail.emerg +ret: 0 +<17>Feb 13 23:31:30 prio: mail.alert +ret: 0 +<18>Feb 13 23:31:30 prio: mail.crit +ret: 0 +<19>Feb 13 23:31:30 prio: mail.err +ret: 0 +<20>Feb 13 23:31:30 prio: mail.warning +ret: 0 +<21>Feb 13 23:31:30 prio: mail.notice +ret: 0 +<22>Feb 13 23:31:30 prio: mail.info +ret: 0 +<23>Feb 13 23:31:30 prio: mail.debug +ret: 0 +<56>Feb 13 23:31:30 prio: news.emerg +ret: 0 +<57>Feb 13 23:31:30 prio: news.alert +ret: 0 +<58>Feb 13 23:31:30 prio: news.crit +ret: 0 +<59>Feb 13 23:31:30 prio: news.err +ret: 0 +<60>Feb 13 23:31:30 prio: news.warning +ret: 0 +<61>Feb 13 23:31:30 prio: news.notice +ret: 0 +<62>Feb 13 23:31:30 prio: news.info +ret: 0 +<63>Feb 13 23:31:30 prio: news.debug +ret: 0 +<40>Feb 13 23:31:30 prio: syslog.emerg +ret: 0 +<41>Feb 13 23:31:30 prio: syslog.alert +ret: 0 +<42>Feb 13 23:31:30 prio: syslog.crit +ret: 0 +<43>Feb 13 23:31:30 prio: syslog.err +ret: 0 +<44>Feb 13 23:31:30 prio: syslog.warning +ret: 0 +<45>Feb 13 23:31:30 prio: syslog.notice +ret: 0 +<46>Feb 13 23:31:30 prio: syslog.info +ret: 0 +<47>Feb 13 23:31:30 prio: syslog.debug +ret: 0 +<8>Feb 13 23:31:30 prio: user.emerg +ret: 0 +<9>Feb 13 23:31:30 prio: user.alert +ret: 0 +<10>Feb 13 23:31:30 prio: user.crit +ret: 0 +<11>Feb 13 23:31:30 prio: user.err +ret: 0 +<12>Feb 13 23:31:30 prio: user.warning +ret: 0 +<13>Feb 13 23:31:30 prio: user.notice +ret: 0 +<14>Feb 13 23:31:30 prio: user.info +ret: 0 +<15>Feb 13 23:31:30 prio: user.debug +ret: 0 +<64>Feb 13 23:31:30 prio: uucp.emerg +ret: 0 +<65>Feb 13 23:31:30 prio: uucp.alert +ret: 0 +<66>Feb 13 23:31:30 prio: uucp.crit +ret: 0 +<67>Feb 13 23:31:30 prio: uucp.err +ret: 0 +<68>Feb 13 23:31:30 prio: uucp.warning +ret: 0 +<69>Feb 13 23:31:30 prio: uucp.notice +ret: 0 +<70>Feb 13 23:31:30 prio: uucp.info +ret: 0 +<71>Feb 13 23:31:30 prio: uucp.debug +ret: 0 +<128>Feb 13 23:31:30 prio: local0.emerg +ret: 0 +<129>Feb 13 23:31:30 prio: local0.alert +ret: 0 +<130>Feb 13 23:31:30 prio: local0.crit +ret: 0 +<131>Feb 13 23:31:30 prio: local0.err +ret: 0 +<132>Feb 13 23:31:30 prio: local0.warning +ret: 0 +<133>Feb 13 23:31:30 prio: local0.notice +ret: 0 +<134>Feb 13 23:31:30 prio: local0.info +ret: 0 +<135>Feb 13 23:31:30 prio: local0.debug +ret: 0 +<136>Feb 13 23:31:30 prio: local1.emerg +ret: 0 +<137>Feb 13 23:31:30 prio: local1.alert +ret: 0 +<138>Feb 13 23:31:30 prio: local1.crit +ret: 0 +<139>Feb 13 23:31:30 prio: local1.err +ret: 0 +<140>Feb 13 23:31:30 prio: local1.warning +ret: 0 +<141>Feb 13 23:31:30 prio: local1.notice +ret: 0 +<142>Feb 13 23:31:30 prio: local1.info +ret: 0 +<143>Feb 13 23:31:30 prio: local1.debug +ret: 0 +<144>Feb 13 23:31:30 prio: local2.emerg +ret: 0 +<145>Feb 13 23:31:30 prio: local2.alert +ret: 0 +<146>Feb 13 23:31:30 prio: local2.crit +ret: 0 +<147>Feb 13 23:31:30 prio: local2.err +ret: 0 +<148>Feb 13 23:31:30 prio: local2.warning +ret: 0 +<149>Feb 13 23:31:30 prio: local2.notice +ret: 0 +<150>Feb 13 23:31:30 prio: local2.info +ret: 0 +<151>Feb 13 23:31:30 prio: local2.debug +ret: 0 +<152>Feb 13 23:31:30 prio: local3.emerg +ret: 0 +<153>Feb 13 23:31:30 prio: local3.alert +ret: 0 +<154>Feb 13 23:31:30 prio: local3.crit +ret: 0 +<155>Feb 13 23:31:30 prio: local3.err +ret: 0 +<156>Feb 13 23:31:30 prio: local3.warning +ret: 0 +<157>Feb 13 23:31:30 prio: local3.notice +ret: 0 +<158>Feb 13 23:31:30 prio: local3.info +ret: 0 +<159>Feb 13 23:31:30 prio: local3.debug +ret: 0 +<160>Feb 13 23:31:30 prio: local4.emerg +ret: 0 +<161>Feb 13 23:31:30 prio: local4.alert +ret: 0 +<162>Feb 13 23:31:30 prio: local4.crit +ret: 0 +<163>Feb 13 23:31:30 prio: local4.err +ret: 0 +<164>Feb 13 23:31:30 prio: local4.warning +ret: 0 +<165>Feb 13 23:31:30 prio: local4.notice +ret: 0 +<166>Feb 13 23:31:30 prio: local4.info +ret: 0 +<167>Feb 13 23:31:30 prio: local4.debug +ret: 0 +<168>Feb 13 23:31:30 prio: local5.emerg +ret: 0 +<169>Feb 13 23:31:30 prio: local5.alert +ret: 0 +<170>Feb 13 23:31:30 prio: local5.crit +ret: 0 +<171>Feb 13 23:31:30 prio: local5.err +ret: 0 +<172>Feb 13 23:31:30 prio: local5.warning +ret: 0 +<173>Feb 13 23:31:30 prio: local5.notice +ret: 0 +<174>Feb 13 23:31:30 prio: local5.info +ret: 0 +<175>Feb 13 23:31:30 prio: local5.debug +ret: 0 +<176>Feb 13 23:31:30 prio: local6.emerg +ret: 0 +<177>Feb 13 23:31:30 prio: local6.alert +ret: 0 +<178>Feb 13 23:31:30 prio: local6.crit +ret: 0 +<179>Feb 13 23:31:30 prio: local6.err +ret: 0 +<180>Feb 13 23:31:30 prio: local6.warning +ret: 0 +<181>Feb 13 23:31:30 prio: local6.notice +ret: 0 +<182>Feb 13 23:31:30 prio: local6.info +ret: 0 +<183>Feb 13 23:31:30 prio: local6.debug +ret: 0 +<184>Feb 13 23:31:30 prio: local7.emerg +ret: 0 +<185>Feb 13 23:31:30 prio: local7.alert +ret: 0 +<186>Feb 13 23:31:30 prio: local7.crit +ret: 0 +<187>Feb 13 23:31:30 prio: local7.err +ret: 0 +<188>Feb 13 23:31:30 prio: local7.warning +ret: 0 +<189>Feb 13 23:31:30 prio: local7.notice +ret: 0 +<190>Feb 13 23:31:30 prio: local7.info +ret: 0 +<191>Feb 13 23:31:30 prio: local7.debug +ret: 0 diff --git a/tests/expected/logger/formats-rfc3164 b/tests/expected/logger/formats-rfc3164 index 2ab9fd5b01..e69de29bb2 100644 --- a/tests/expected/logger/formats-rfc3164 +++ b/tests/expected/logger/formats-rfc3164 @@ -1,2 +0,0 @@ -<13>Feb 13 23:31:30 test-hostname rfc3164: message -ret: 0 diff --git a/tests/expected/logger/formats-rfc3164.err b/tests/expected/logger/formats-rfc3164.err new file mode 100644 index 0000000000..2ab9fd5b01 --- /dev/null +++ b/tests/expected/logger/formats-rfc3164.err @@ -0,0 +1,2 @@ +<13>Feb 13 23:31:30 test-hostname rfc3164: message +ret: 0 diff --git a/tests/expected/logger/formats-rfc5424_msgid b/tests/expected/logger/formats-rfc5424_msgid index 755e97b001..e69de29bb2 100644 --- a/tests/expected/logger/formats-rfc5424_msgid +++ b/tests/expected/logger/formats-rfc5424_msgid @@ -1,2 +0,0 @@ -<13>1 2009-02-13T23:31:30.123456+00:00 test-hostname rfc5424 - MSGID [timeQuality tzKnown="1" isSynced="0"] message -ret: 0 diff --git a/tests/expected/logger/formats-rfc5424_msgid.err b/tests/expected/logger/formats-rfc5424_msgid.err new file mode 100644 index 0000000000..755e97b001 --- /dev/null +++ b/tests/expected/logger/formats-rfc5424_msgid.err @@ -0,0 +1,2 @@ +<13>1 2009-02-13T23:31:30.123456+00:00 test-hostname rfc5424 - MSGID [timeQuality tzKnown="1" isSynced="0"] message +ret: 0 diff --git a/tests/expected/logger/formats-rfc5424_nohost b/tests/expected/logger/formats-rfc5424_nohost index 30ed025274..e69de29bb2 100644 --- a/tests/expected/logger/formats-rfc5424_nohost +++ b/tests/expected/logger/formats-rfc5424_nohost @@ -1,2 +0,0 @@ -<13>1 2009-02-13T23:31:30.123456+00:00 - rfc5424 - - [timeQuality tzKnown="1" isSynced="0"] message -ret: 0 diff --git a/tests/expected/logger/formats-rfc5424_nohost.err b/tests/expected/logger/formats-rfc5424_nohost.err new file mode 100644 index 0000000000..30ed025274 --- /dev/null +++ b/tests/expected/logger/formats-rfc5424_nohost.err @@ -0,0 +1,2 @@ +<13>1 2009-02-13T23:31:30.123456+00:00 - rfc5424 - - [timeQuality tzKnown="1" isSynced="0"] message +ret: 0 diff --git a/tests/expected/logger/formats-rfc5424_notime b/tests/expected/logger/formats-rfc5424_notime index d9c96f35fb..e69de29bb2 100644 --- a/tests/expected/logger/formats-rfc5424_notime +++ b/tests/expected/logger/formats-rfc5424_notime @@ -1,2 +0,0 @@ -<13>1 - test-hostname rfc5424 - - - message -ret: 0 diff --git a/tests/expected/logger/formats-rfc5424_notime.err b/tests/expected/logger/formats-rfc5424_notime.err new file mode 100644 index 0000000000..d9c96f35fb --- /dev/null +++ b/tests/expected/logger/formats-rfc5424_notime.err @@ -0,0 +1,2 @@ +<13>1 - test-hostname rfc5424 - - - message +ret: 0 diff --git a/tests/expected/logger/formats-rfc5424_simple b/tests/expected/logger/formats-rfc5424_simple index 90e5a34494..e69de29bb2 100644 --- a/tests/expected/logger/formats-rfc5424_simple +++ b/tests/expected/logger/formats-rfc5424_simple @@ -1,2 +0,0 @@ -<13>1 2009-02-13T23:31:30.123456+00:00 test-hostname rfc5424 - - [timeQuality tzKnown="1" isSynced="0"] message -ret: 0 diff --git a/tests/expected/logger/formats-rfc5424_simple.err b/tests/expected/logger/formats-rfc5424_simple.err new file mode 100644 index 0000000000..90e5a34494 --- /dev/null +++ b/tests/expected/logger/formats-rfc5424_simple.err @@ -0,0 +1,2 @@ +<13>1 2009-02-13T23:31:30.123456+00:00 test-hostname rfc5424 - - [timeQuality tzKnown="1" isSynced="0"] message +ret: 0 diff --git a/tests/expected/logger/journald b/tests/expected/logger/journald index 354628d168..e69de29bb2 100644 --- a/tests/expected/logger/journald +++ b/tests/expected/logger/journald @@ -1,3 +0,0 @@ -MESSAGE_ID=b8f74e14bc714bfc8040a5106dc9376a -MESSAGE=a b c 1 2 3 -ret: 0 diff --git a/tests/expected/logger/journald.err b/tests/expected/logger/journald.err new file mode 100644 index 0000000000..354628d168 --- /dev/null +++ b/tests/expected/logger/journald.err @@ -0,0 +1,3 @@ +MESSAGE_ID=b8f74e14bc714bfc8040a5106dc9376a +MESSAGE=a b c 1 2 3 +ret: 0 diff --git a/tests/expected/logger/options-check_socket b/tests/expected/logger/options-check_socket index fa36c4e5be..e69de29bb2 100644 --- a/tests/expected/logger/options-check_socket +++ b/tests/expected/logger/options-check_socket @@ -1 +0,0 @@ -Check written socket data of all subtests. diff --git a/tests/expected/logger/options-check_socket.err b/tests/expected/logger/options-check_socket.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/logger/options-input_file_empty_line b/tests/expected/logger/options-input_file_empty_line index d276e3ce15..e69de29bb2 100644 --- a/tests/expected/logger/options-input_file_empty_line +++ b/tests/expected/logger/options-input_file_empty_line @@ -1,4 +0,0 @@ -<13>Feb 13 23:31:30 test_tag: a1 a2 a3 a4 a5 b1 b2 b3 b4 b5 c1 c2 c3 c4 c5 -<13>Feb 13 23:31:30 test_tag: -<13>Feb 13 23:31:30 test_tag: 5{c..1} 4{c..1} 3{c..1} 2{c..1} 1{c..1} -ret: 0 diff --git a/tests/expected/logger/options-input_file_empty_line.err b/tests/expected/logger/options-input_file_empty_line.err new file mode 100644 index 0000000000..d276e3ce15 --- /dev/null +++ b/tests/expected/logger/options-input_file_empty_line.err @@ -0,0 +1,4 @@ +<13>Feb 13 23:31:30 test_tag: a1 a2 a3 a4 a5 b1 b2 b3 b4 b5 c1 c2 c3 c4 c5 +<13>Feb 13 23:31:30 test_tag: +<13>Feb 13 23:31:30 test_tag: 5{c..1} 4{c..1} 3{c..1} 2{c..1} 1{c..1} +ret: 0 diff --git a/tests/expected/logger/options-input_file_prio_prefix b/tests/expected/logger/options-input_file_prio_prefix index df69bb991c..e69de29bb2 100644 --- a/tests/expected/logger/options-input_file_prio_prefix +++ b/tests/expected/logger/options-input_file_prio_prefix @@ -1,2 +0,0 @@ -<66>Feb 13 23:31:30 test_tag: prio_prefix -ret: 0 diff --git a/tests/expected/logger/options-input_file_prio_prefix.err b/tests/expected/logger/options-input_file_prio_prefix.err new file mode 100644 index 0000000000..df69bb991c --- /dev/null +++ b/tests/expected/logger/options-input_file_prio_prefix.err @@ -0,0 +1,2 @@ +<66>Feb 13 23:31:30 test_tag: prio_prefix +ret: 0 diff --git a/tests/expected/logger/options-input_file_simple b/tests/expected/logger/options-input_file_simple index d855247b2b..e69de29bb2 100644 --- a/tests/expected/logger/options-input_file_simple +++ b/tests/expected/logger/options-input_file_simple @@ -1,2 +0,0 @@ -<13>Feb 13 23:31:30 test_tag: a1 a2 a3 a4 a5 b1 b2 b3 b4 b5 c1 c2 c3 c4 c5 -ret: 0 diff --git a/tests/expected/logger/options-input_file_simple.err b/tests/expected/logger/options-input_file_simple.err new file mode 100644 index 0000000000..d855247b2b --- /dev/null +++ b/tests/expected/logger/options-input_file_simple.err @@ -0,0 +1,2 @@ +<13>Feb 13 23:31:30 test_tag: a1 a2 a3 a4 a5 b1 b2 b3 b4 b5 c1 c2 c3 c4 c5 +ret: 0 diff --git a/tests/expected/logger/options-input_file_skip_empty b/tests/expected/logger/options-input_file_skip_empty index 277c186889..e69de29bb2 100644 --- a/tests/expected/logger/options-input_file_skip_empty +++ b/tests/expected/logger/options-input_file_skip_empty @@ -1,3 +0,0 @@ -<13>Feb 13 23:31:30 test_tag: a1 a2 a3 a4 a5 b1 b2 b3 b4 b5 c1 c2 c3 c4 c5 -<13>Feb 13 23:31:30 test_tag: 5{c..1} 4{c..1} 3{c..1} 2{c..1} 1{c..1} -ret: 0 diff --git a/tests/expected/logger/options-input_file_skip_empty.err b/tests/expected/logger/options-input_file_skip_empty.err new file mode 100644 index 0000000000..277c186889 --- /dev/null +++ b/tests/expected/logger/options-input_file_skip_empty.err @@ -0,0 +1,3 @@ +<13>Feb 13 23:31:30 test_tag: a1 a2 a3 a4 a5 b1 b2 b3 b4 b5 c1 c2 c3 c4 c5 +<13>Feb 13 23:31:30 test_tag: 5{c..1} 4{c..1} 3{c..1} 2{c..1} 1{c..1} +ret: 0 diff --git a/tests/expected/logger/options-log_pid b/tests/expected/logger/options-log_pid index 47a0147b29..e69de29bb2 100644 --- a/tests/expected/logger/options-log_pid +++ b/tests/expected/logger/options-log_pid @@ -1,2 +0,0 @@ -<13>Feb 13 23:31:30 test_tag[98765]: test -ret: 0 diff --git a/tests/expected/logger/options-log_pid.err b/tests/expected/logger/options-log_pid.err new file mode 100644 index 0000000000..47a0147b29 --- /dev/null +++ b/tests/expected/logger/options-log_pid.err @@ -0,0 +1,2 @@ +<13>Feb 13 23:31:30 test_tag[98765]: test +ret: 0 diff --git a/tests/expected/logger/options-log_pid_define b/tests/expected/logger/options-log_pid_define index e47b875b68..e69de29bb2 100644 --- a/tests/expected/logger/options-log_pid_define +++ b/tests/expected/logger/options-log_pid_define @@ -1,2 +0,0 @@ -<13>Feb 13 23:31:30 test_tag[12345]: test -ret: 0 diff --git a/tests/expected/logger/options-log_pid_define.err b/tests/expected/logger/options-log_pid_define.err new file mode 100644 index 0000000000..e47b875b68 --- /dev/null +++ b/tests/expected/logger/options-log_pid_define.err @@ -0,0 +1,2 @@ +<13>Feb 13 23:31:30 test_tag[12345]: test +ret: 0 diff --git a/tests/expected/logger/options-log_pid_long b/tests/expected/logger/options-log_pid_long index 47a0147b29..e69de29bb2 100644 --- a/tests/expected/logger/options-log_pid_long +++ b/tests/expected/logger/options-log_pid_long @@ -1,2 +0,0 @@ -<13>Feb 13 23:31:30 test_tag[98765]: test -ret: 0 diff --git a/tests/expected/logger/options-log_pid_long.err b/tests/expected/logger/options-log_pid_long.err new file mode 100644 index 0000000000..47a0147b29 --- /dev/null +++ b/tests/expected/logger/options-log_pid_long.err @@ -0,0 +1,2 @@ +<13>Feb 13 23:31:30 test_tag[98765]: test +ret: 0 diff --git a/tests/expected/logger/options-log_pid_no_arg b/tests/expected/logger/options-log_pid_no_arg index 47a0147b29..e69de29bb2 100644 --- a/tests/expected/logger/options-log_pid_no_arg +++ b/tests/expected/logger/options-log_pid_no_arg @@ -1,2 +0,0 @@ -<13>Feb 13 23:31:30 test_tag[98765]: test -ret: 0 diff --git a/tests/expected/logger/options-log_pid_no_arg.err b/tests/expected/logger/options-log_pid_no_arg.err new file mode 100644 index 0000000000..47a0147b29 --- /dev/null +++ b/tests/expected/logger/options-log_pid_no_arg.err @@ -0,0 +1,2 @@ +<13>Feb 13 23:31:30 test_tag[98765]: test +ret: 0 diff --git a/tests/expected/logger/options-simple b/tests/expected/logger/options-simple index 2fa18e01e1..e69de29bb2 100644 --- a/tests/expected/logger/options-simple +++ b/tests/expected/logger/options-simple @@ -1,2 +0,0 @@ -<13>Feb 13 23:31:30 test_tag: test -ret: 0 diff --git a/tests/expected/logger/options-simple.err b/tests/expected/logger/options-simple.err new file mode 100644 index 0000000000..2fa18e01e1 --- /dev/null +++ b/tests/expected/logger/options-simple.err @@ -0,0 +1,2 @@ +<13>Feb 13 23:31:30 test_tag: test +ret: 0 diff --git a/tests/expected/logger/options.err b/tests/expected/logger/options.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/minix/fsck b/tests/expected/minix/fsck index 4d65d1203a..fe0c058cdc 100644 --- a/tests/expected/minix/fsck +++ b/tests/expected/minix/fsck @@ -96,7 +96,6 @@ namelen=30 return fsck: 0 ##################################### $ mkfs.minix -n 60 image -mkfs.minix: unsupported name length: 60 return mkfs: 8 ##################################### $ mkfs.minix -1 image @@ -196,7 +195,6 @@ namelen=30 return fsck: 0 ##################################### $ mkfs.minix -1 -n 60 image -mkfs.minix: unsupported name length: 60 return mkfs: 8 ##################################### $ mkfs.minix -2 image @@ -296,7 +294,6 @@ namelen=30 return fsck: 0 ##################################### $ mkfs.minix -2 -n 60 image -mkfs.minix: unsupported name length: 60 return mkfs: 8 ##################################### $ mkfs.minix -3 image @@ -331,11 +328,9 @@ namelen=60 return fsck: 0 ##################################### $ mkfs.minix -3 -n 14 image -mkfs.minix: unsupported name length: 14 return mkfs: 8 ##################################### $ mkfs.minix -3 -n 30 image -mkfs.minix: unsupported name length: 30 return mkfs: 8 ##################################### $ mkfs.minix -3 -n 60 image diff --git a/tests/expected/minix/fsck.err b/tests/expected/minix/fsck.err new file mode 100644 index 0000000000..30d273567a --- /dev/null +++ b/tests/expected/minix/fsck.err @@ -0,0 +1,32 @@ +$ mkfs.minix image +$ fsck.minix -lavsf image +$ mkfs.minix -n 14 image +$ fsck.minix -lavsf image +$ mkfs.minix -n 30 image +$ fsck.minix -lavsf image +$ mkfs.minix -n 60 image +mkfs.minix: unsupported name length: 60 +$ mkfs.minix -1 image +$ fsck.minix -lavsf image +$ mkfs.minix -1 -n 14 image +$ fsck.minix -lavsf image +$ mkfs.minix -1 -n 30 image +$ fsck.minix -lavsf image +$ mkfs.minix -1 -n 60 image +mkfs.minix: unsupported name length: 60 +$ mkfs.minix -2 image +$ fsck.minix -lavsf image +$ mkfs.minix -2 -n 14 image +$ fsck.minix -lavsf image +$ mkfs.minix -2 -n 30 image +$ fsck.minix -lavsf image +$ mkfs.minix -2 -n 60 image +mkfs.minix: unsupported name length: 60 +$ mkfs.minix -3 image +$ fsck.minix -lavsf image +$ mkfs.minix -3 -n 14 image +mkfs.minix: unsupported name length: 14 +$ mkfs.minix -3 -n 30 image +mkfs.minix: unsupported name length: 30 +$ mkfs.minix -3 -n 60 image +$ fsck.minix -lavsf image diff --git a/tests/expected/misc/ionice b/tests/expected/misc/ionice index afdf0ea7d3..a4fdd0414c 100644 --- a/tests/expected/misc/ionice +++ b/tests/expected/misc/ionice @@ -1,9 +1,2 @@ -ionice: ignoring given class data for none class -ionice: unknown prio class 7 -ionice: ioprio_set failed: Invalid argument -ionice: unknown prio class 7 -ionice: ioprio_set failed: Invalid argument -ionice: unknown prio class 8 -ionice: ioprio_set failed: Invalid argument /etc/passwd none: prio 0 diff --git a/tests/expected/misc/ionice.err b/tests/expected/misc/ionice.err new file mode 100644 index 0000000000..7ef53992e2 --- /dev/null +++ b/tests/expected/misc/ionice.err @@ -0,0 +1,7 @@ +ionice: ignoring given class data for none class +ionice: unknown prio class 7 +ionice: ioprio_set failed: Invalid argument +ionice: unknown prio class 7 +ionice: ioprio_set failed: Invalid argument +ionice: unknown prio class 8 +ionice: ioprio_set failed: Invalid argument diff --git a/tests/expected/misc/mountpoint-mutually-exclusive b/tests/expected/misc/mountpoint-mutually-exclusive index 38c36f13b4..d00491fd7e 100644 --- a/tests/expected/misc/mountpoint-mutually-exclusive +++ b/tests/expected/misc/mountpoint-mutually-exclusive @@ -1,2 +1 @@ -mountpoint: --devno and --nofollow are mutually exclusive 1 diff --git a/tests/expected/misc/mountpoint-mutually-exclusive.err b/tests/expected/misc/mountpoint-mutually-exclusive.err new file mode 100644 index 0000000000..2e8fefdd60 --- /dev/null +++ b/tests/expected/misc/mountpoint-mutually-exclusive.err @@ -0,0 +1 @@ +mountpoint: --devno and --nofollow are mutually exclusive diff --git a/tests/expected/misc/setarch-options b/tests/expected/misc/setarch-options index e04358543a..c06c8f56bb 100644 --- a/tests/expected/misc/setarch-options +++ b/tests/expected/misc/setarch-options @@ -1,9 +1,7 @@ ###### unknown arch -setarch: qubit: Unrecognized architecture exit: 1 ###### unknown command Execute command `/das/gibs/nicht'. -setarch: failed to execute /das/gibs/nicht: No such file or directory exit: 127 ###### noop uname -a Execute command `uname'. diff --git a/tests/expected/misc/setarch-options.err b/tests/expected/misc/setarch-options.err new file mode 100644 index 0000000000..a6e064e560 --- /dev/null +++ b/tests/expected/misc/setarch-options.err @@ -0,0 +1,4 @@ +###### unknown arch +setarch: qubit: Unrecognized architecture +###### unknown command +setarch: failed to execute /das/gibs/nicht: No such file or directory diff --git a/tests/expected/misc/strtosize b/tests/expected/misc/strtosize index 94fd69a1fe..8d93e142d3 100644 --- a/tests/expected/misc/strtosize +++ b/tests/expected/misc/strtosize @@ -1,4 +1,3 @@ -test_strutils: invalid size '-1' value 0 : 0 : 0B : 0 B 1 : 1 : 1B : 1 B 123 : 123 : 123B : 123 B @@ -21,10 +20,7 @@ test_strutils: invalid size '-1' value 1TB : 1000000000000 : 931.3G : 931.3 GiB 1PB : 1000000000000000 : 909.5T : 909.5 TiB 1EB : 1000000000000000000 : 888.2P : 888.2 PiB -test_strutils: invalid size '' value -test_strutils: invalid size ' ' value 1 : 1 : 1B : 1 B -test_strutils: invalid size '1 ' value 0x0a : 10 : 10B : 10 B 0xff00 : 65280 : 63.8K : 63.8 KiB 0x80000000 : 2147483648 : 2G : 2 GiB diff --git a/tests/expected/misc/strtosize.err b/tests/expected/misc/strtosize.err new file mode 100644 index 0000000000..67c9b87d1b --- /dev/null +++ b/tests/expected/misc/strtosize.err @@ -0,0 +1,4 @@ +test_strutils: invalid size '-1' value +test_strutils: invalid size '' value +test_strutils: invalid size ' ' value +test_strutils: invalid size '1 ' value diff --git a/tests/expected/sfdisk/dos-explicit-size b/tests/expected/sfdisk/dos-explicit-size index 10e07384b7..70f1ba7981 100644 --- a/tests/expected/sfdisk/dos-explicit-size +++ b/tests/expected/sfdisk/dos-explicit-size @@ -30,13 +30,6 @@ Device Boot Start End Sectors Size Id Type 6 4003 5002 1000 500K 83 Linux 7 5004 102399 97396 47.6M 83 Linux -Partition 1 does not start on physical sector boundary. -Partition 2 does not start on physical sector boundary. -Partition 3 does not start on physical sector boundary. -Partition 4 does not start on physical sector boundary. -Partition 5 does not start on physical sector boundary. -Partition 6 does not start on physical sector boundary. -Partition 7 does not start on physical sector boundary. The partition table has been altered. Calling ioctl() to re-read partition table. diff --git a/tests/expected/sfdisk/dos-explicit-size.err b/tests/expected/sfdisk/dos-explicit-size.err new file mode 100644 index 0000000000..975a4ee107 --- /dev/null +++ b/tests/expected/sfdisk/dos-explicit-size.err @@ -0,0 +1,7 @@ +Partition 1 does not start on physical sector boundary. +Partition 2 does not start on physical sector boundary. +Partition 3 does not start on physical sector boundary. +Partition 4 does not start on physical sector boundary. +Partition 5 does not start on physical sector boundary. +Partition 6 does not start on physical sector boundary. +Partition 7 does not start on physical sector boundary. diff --git a/tests/expected/sfdisk/dos-read-dump b/tests/expected/sfdisk/dos-read-dump index a25429c4b9..b4f24491bb 100644 --- a/tests/expected/sfdisk/dos-read-dump +++ b/tests/expected/sfdisk/dos-read-dump @@ -29,8 +29,6 @@ Device Boot Start End Sectors Size Id Type 5 20481 26624 6144 3M 83 Linux 6 26626 102399 75774 37M 83 Linux -Partition 5 does not start on physical sector boundary. -Partition 6 does not start on physical sector boundary. The partition table has been altered. Calling ioctl() to re-read partition table. diff --git a/tests/expected/sfdisk/dos-read-dump.err b/tests/expected/sfdisk/dos-read-dump.err new file mode 100644 index 0000000000..48536f8a18 --- /dev/null +++ b/tests/expected/sfdisk/dos-read-dump.err @@ -0,0 +1,2 @@ +Partition 5 does not start on physical sector boundary. +Partition 6 does not start on physical sector boundary. diff --git a/tests/expected/sfdisk/gpt-attrs b/tests/expected/sfdisk/gpt-attrs index 1ba16195b6..8e643b5a2a 100644 --- a/tests/expected/sfdisk/gpt-attrs +++ b/tests/expected/sfdisk/gpt-attrs @@ -1106,5 +1106,3 @@ GPT Entries: offset = 1024, size = 16384 bytes. 000043f0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 Expert command (m for help): - -Expert command (m for help): diff --git a/tests/expected/sfdisk/gpt-attrs-broken-guid b/tests/expected/sfdisk/gpt-attrs-broken-guid index 3e57341c32..e69de29bb2 100644 --- a/tests/expected/sfdisk/gpt-attrs-broken-guid +++ b/tests/expected/sfdisk/gpt-attrs-broken-guid @@ -1,2 +0,0 @@ -unsupported GPT attribute bit 'GUID:NoBlockIOProtocol GUID:GUID:63 RequiredPartiton' -sfdisk: : partition 2: failed to set partition attributes diff --git a/tests/expected/sfdisk/gpt-attrs-broken-guid.err b/tests/expected/sfdisk/gpt-attrs-broken-guid.err new file mode 100644 index 0000000000..3e57341c32 --- /dev/null +++ b/tests/expected/sfdisk/gpt-attrs-broken-guid.err @@ -0,0 +1,2 @@ +unsupported GPT attribute bit 'GUID:NoBlockIOProtocol GUID:GUID:63 RequiredPartiton' +sfdisk: : partition 2: failed to set partition attributes diff --git a/tests/expected/sfdisk/gpt-attrs-broken-nosep b/tests/expected/sfdisk/gpt-attrs-broken-nosep index 946979cf12..e69de29bb2 100644 --- a/tests/expected/sfdisk/gpt-attrs-broken-nosep +++ b/tests/expected/sfdisk/gpt-attrs-broken-nosep @@ -1,2 +0,0 @@ -failed to parse GPT attribute string 'NoBlockIOProtocolRequiredPartiton' -sfdisk: : partition 2: failed to set partition attributes diff --git a/tests/expected/sfdisk/gpt-attrs-broken-nosep.err b/tests/expected/sfdisk/gpt-attrs-broken-nosep.err new file mode 100644 index 0000000000..946979cf12 --- /dev/null +++ b/tests/expected/sfdisk/gpt-attrs-broken-nosep.err @@ -0,0 +1,2 @@ +failed to parse GPT attribute string 'NoBlockIOProtocolRequiredPartiton' +sfdisk: : partition 2: failed to set partition attributes diff --git a/tests/expected/sfdisk/gpt-attrs-guid b/tests/expected/sfdisk/gpt-attrs-guid index 3368fb75ba..25716ee127 100644 --- a/tests/expected/sfdisk/gpt-attrs-guid +++ b/tests/expected/sfdisk/gpt-attrs-guid @@ -1106,5 +1106,3 @@ GPT Entries: offset = 1024, size = 16384 bytes. 000043f0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 Expert command (m for help): - -Expert command (m for help): diff --git a/tests/expected/sfdisk/gpt-attrs-guid.err b/tests/expected/sfdisk/gpt-attrs-guid.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/sfdisk/gpt-attrs-space b/tests/expected/sfdisk/gpt-attrs-space index 1ba16195b6..8e643b5a2a 100644 --- a/tests/expected/sfdisk/gpt-attrs-space +++ b/tests/expected/sfdisk/gpt-attrs-space @@ -1106,5 +1106,3 @@ GPT Entries: offset = 1024, size = 16384 bytes. 000043f0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 Expert command (m for help): - -Expert command (m for help): diff --git a/tests/expected/sfdisk/gpt-attrs-space.err b/tests/expected/sfdisk/gpt-attrs-space.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/sfdisk/gpt-attrs-unsupported b/tests/expected/sfdisk/gpt-attrs-unsupported index 8577358589..e69de29bb2 100644 --- a/tests/expected/sfdisk/gpt-attrs-unsupported +++ b/tests/expected/sfdisk/gpt-attrs-unsupported @@ -1,2 +0,0 @@ -unsupported GPT attribute bit 'FooBar 48 51' -sfdisk: : partition 2: failed to set partition attributes diff --git a/tests/expected/sfdisk/gpt-attrs-unsupported.err b/tests/expected/sfdisk/gpt-attrs-unsupported.err new file mode 100644 index 0000000000..8577358589 --- /dev/null +++ b/tests/expected/sfdisk/gpt-attrs-unsupported.err @@ -0,0 +1,2 @@ +unsupported GPT attribute bit 'FooBar 48 51' +sfdisk: : partition 2: failed to set partition attributes diff --git a/tests/expected/sfdisk/gpt-attrs-with-typo b/tests/expected/sfdisk/gpt-attrs-with-typo index 1ba16195b6..8e643b5a2a 100644 --- a/tests/expected/sfdisk/gpt-attrs-with-typo +++ b/tests/expected/sfdisk/gpt-attrs-with-typo @@ -1106,5 +1106,3 @@ GPT Entries: offset = 1024, size = 16384 bytes. 000043f0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 Expert command (m for help): - -Expert command (m for help): diff --git a/tests/expected/sfdisk/gpt-attrs-with-typo.err b/tests/expected/sfdisk/gpt-attrs-with-typo.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/sfdisk/gpt-attrs.err b/tests/expected/sfdisk/gpt-attrs.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/sfdisk/gpt-list-pmbr b/tests/expected/sfdisk/gpt-list-pmbr index 13a5e69f66..72f5fff79b 100644 --- a/tests/expected/sfdisk/gpt-list-pmbr +++ b/tests/expected/sfdisk/gpt-list-pmbr @@ -8,4 +8,3 @@ Disk identifier: Device Boot Start End Sectors Size Id Type 1 1 102399 102399 50M ee GPT -Partition 1 does not start on physical sector boundary. diff --git a/tests/expected/sfdisk/gpt-list-pmbr.err b/tests/expected/sfdisk/gpt-list-pmbr.err new file mode 100644 index 0000000000..5d5139074f --- /dev/null +++ b/tests/expected/sfdisk/gpt-list-pmbr.err @@ -0,0 +1 @@ +Partition 1 does not start on physical sector boundary. diff --git a/tests/expected/sfdisk/script-broken-1 b/tests/expected/sfdisk/script-broken-1 index 6441c122fd..5da97774f4 100644 --- a/tests/expected/sfdisk/script-broken-1 +++ b/tests/expected/sfdisk/script-broken-1 @@ -9,8 +9,7 @@ I/O size (minimum/optimal): 4096 bytes / bytes >>> Script header accepted. >>> Script header accepted. >>> Script header accepted. ->>> line 5: unsupported command - +>>> New situation: Leaving. diff --git a/tests/expected/sfdisk/script-broken-1.err b/tests/expected/sfdisk/script-broken-1.err new file mode 100644 index 0000000000..bee3b2e0d0 --- /dev/null +++ b/tests/expected/sfdisk/script-broken-1.err @@ -0,0 +1 @@ +line 5: unsupported command diff --git a/tests/expected/sfdisk/script-broken-2 b/tests/expected/sfdisk/script-broken-2 index 6441c122fd..5da97774f4 100644 --- a/tests/expected/sfdisk/script-broken-2 +++ b/tests/expected/sfdisk/script-broken-2 @@ -9,8 +9,7 @@ I/O size (minimum/optimal): 4096 bytes / bytes >>> Script header accepted. >>> Script header accepted. >>> Script header accepted. ->>> line 5: unsupported command - +>>> New situation: Leaving. diff --git a/tests/expected/sfdisk/script-broken-2.err b/tests/expected/sfdisk/script-broken-2.err new file mode 100644 index 0000000000..bee3b2e0d0 --- /dev/null +++ b/tests/expected/sfdisk/script-broken-2.err @@ -0,0 +1 @@ +line 5: unsupported command diff --git a/tests/expected/sfdisk/script-broken-3 b/tests/expected/sfdisk/script-broken-3 index 6441c122fd..5da97774f4 100644 --- a/tests/expected/sfdisk/script-broken-3 +++ b/tests/expected/sfdisk/script-broken-3 @@ -9,8 +9,7 @@ I/O size (minimum/optimal): 4096 bytes / bytes >>> Script header accepted. >>> Script header accepted. >>> Script header accepted. ->>> line 5: unsupported command - +>>> New situation: Leaving. diff --git a/tests/expected/sfdisk/script-broken-3.err b/tests/expected/sfdisk/script-broken-3.err new file mode 100644 index 0000000000..bee3b2e0d0 --- /dev/null +++ b/tests/expected/sfdisk/script-broken-3.err @@ -0,0 +1 @@ +line 5: unsupported command diff --git a/tests/expected/sfdisk/script-broken-4 b/tests/expected/sfdisk/script-broken-4 index 6441c122fd..5da97774f4 100644 --- a/tests/expected/sfdisk/script-broken-4 +++ b/tests/expected/sfdisk/script-broken-4 @@ -9,8 +9,7 @@ I/O size (minimum/optimal): 4096 bytes / bytes >>> Script header accepted. >>> Script header accepted. >>> Script header accepted. ->>> line 5: unsupported command - +>>> New situation: Leaving. diff --git a/tests/expected/sfdisk/script-broken-4.err b/tests/expected/sfdisk/script-broken-4.err new file mode 100644 index 0000000000..bee3b2e0d0 --- /dev/null +++ b/tests/expected/sfdisk/script-broken-4.err @@ -0,0 +1 @@ +line 5: unsupported command diff --git a/tests/expected/sfdisk/script-broken-5 b/tests/expected/sfdisk/script-broken-5 index 6441c122fd..5da97774f4 100644 --- a/tests/expected/sfdisk/script-broken-5 +++ b/tests/expected/sfdisk/script-broken-5 @@ -9,8 +9,7 @@ I/O size (minimum/optimal): 4096 bytes / bytes >>> Script header accepted. >>> Script header accepted. >>> Script header accepted. ->>> line 5: unsupported command - +>>> New situation: Leaving. diff --git a/tests/expected/sfdisk/script-broken-5.err b/tests/expected/sfdisk/script-broken-5.err new file mode 100644 index 0000000000..bee3b2e0d0 --- /dev/null +++ b/tests/expected/sfdisk/script-broken-5.err @@ -0,0 +1 @@ +line 5: unsupported command diff --git a/tests/expected/sfdisk/wipe-fs-to-dos b/tests/expected/sfdisk/wipe-fs-to-dos index c4b6cd808a..b9fab7a32a 100644 --- a/tests/expected/sfdisk/wipe-fs-to-dos +++ b/tests/expected/sfdisk/wipe-fs-to-dos @@ -2,9 +2,8 @@ =====Create FS================================ =====Create DOS================================ - - The old swap signature will be removed by a write command. + Disk : 50 MiB, 52428800 bytes, 102400 sectors Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes @@ -13,6 +12,7 @@ I/O size (minimum/optimal): 4096 bytes / bytes >>> Created a new . The old swap signature will be removed by a write command. + 1: Created a new . 2: Done. diff --git a/tests/expected/sfdisk/wipe-fs-to-dos.err b/tests/expected/sfdisk/wipe-fs-to-dos.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/sfdisk/wipe-gpt-to-dos-auto.err b/tests/expected/sfdisk/wipe-gpt-to-dos-auto.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/sfdisk/wipe-gpt-to-dos.err b/tests/expected/sfdisk/wipe-gpt-to-dos.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/expected/sfdisk/wipe-partition b/tests/expected/sfdisk/wipe-partition index 17fa2af7ec..9d608ae74f 100644 --- a/tests/expected/sfdisk/wipe-partition +++ b/tests/expected/sfdisk/wipe-partition @@ -34,7 +34,6 @@ I/O size (minimum/optimal): 4096 bytes / bytes >>> Created a new . 1: Created a new . -Partition #1 contains a swap signature. The signature will be removed by a write command. 2: Done. diff --git a/tests/expected/sfdisk/wipe-partition.err b/tests/expected/sfdisk/wipe-partition.err new file mode 100644 index 0000000000..bce8a4c6ea --- /dev/null +++ b/tests/expected/sfdisk/wipe-partition.err @@ -0,0 +1 @@ +Partition #1 contains a swap signature. diff --git a/tests/expected/sfdisk/wipe.err b/tests/expected/sfdisk/wipe.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/functions.sh b/tests/functions.sh index 1c693d43b7..1ce03e4536 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -174,6 +174,17 @@ function ts_log { [ "$TS_VERBOSE" == "yes" ] && echo "$1" } +function ts_logerr { + echo "$1" >> $TS_ERRLOG + [ "$TS_VERBOSE" == "yes" ] && echo "$1" +} + +function ts_log_both { + echo "$1" >> $TS_OUTPUT + echo "$1" >> $TS_ERRLOG + [ "$TS_VERBOSE" == "yes" ] && echo "$1" +} + function ts_has_option { NAME="$1" ALL="$2" @@ -217,24 +228,28 @@ function ts_init_core_env { TS_SUBNAME="" TS_NS="$TS_COMPONENT/$TS_TESTNAME" TS_OUTPUT="$TS_OUTDIR/$TS_TESTNAME" + TS_ERRLOG="$TS_OUTDIR/$TS_TESTNAME.err" TS_VGDUMP="$TS_OUTDIR/$TS_TESTNAME.vgdump" TS_DIFF="$TS_DIFFDIR/$TS_TESTNAME" TS_EXPECTED="$TS_TOPDIR/expected/$TS_NS" + TS_EXPECTED_ERR="$TS_TOPDIR/expected/$TS_NS.err" TS_MOUNTPOINT="$TS_OUTDIR/${TS_TESTNAME}-mnt" } function ts_init_core_subtest_env { TS_NS="$TS_COMPONENT/$TS_TESTNAME-$TS_SUBNAME" TS_OUTPUT="$TS_OUTDIR/$TS_TESTNAME-$TS_SUBNAME" + TS_ERRLOG="$TS_OUTDIR/$TS_TESTNAME-$TS_SUBNAME.err" TS_VGDUMP="$TS_OUTDIR/$TS_TESTNAME-$TS_SUBNAME.vgdump" TS_DIFF="$TS_DIFFDIR/$TS_TESTNAME-$TS_SUBNAME" TS_EXPECTED="$TS_TOPDIR/expected/$TS_NS" + TS_EXPECTED_ERR="$TS_TOPDIR/expected/$TS_NS.err" TS_MOUNTPOINT="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-mnt" - rm -f $TS_OUTPUT $TS_VGDUMP + rm -f $TS_OUTPUT $TS_ERRLOG $TS_VGDUMP [ -d "$TS_OUTDIR" ] || mkdir -p "$TS_OUTDIR" - touch $TS_OUTPUT + touch $TS_OUTPUT $TS_ERRLOG [ -n "$TS_VALGRIND_CMD" ] && touch $TS_VGDUMP } @@ -339,10 +354,10 @@ function ts_init_env { export BLKID_FILE - rm -f $TS_OUTPUT $TS_VGDUMP + rm -f $TS_OUTPUT $TS_ERRLOG $TS_VGDUMP [ -d "$TS_OUTDIR" ] || mkdir -p "$TS_OUTDIR" - touch $TS_OUTPUT + touch $TS_OUTPUT $TS_ERRLOG [ -n "$TS_VALGRIND_CMD" ] && touch $TS_VGDUMP if [ "$TS_VERBOSE" == "yes" ]; then @@ -359,8 +374,9 @@ function ts_init_env { echo " namespace: $TS_NS" echo " verbose: $TS_VERBOSE" echo " output: $TS_OUTPUT" + echo " error log: $TS_ERRLOG" echo " valgrind: $TS_VGDUMP" - echo " expected: $TS_EXPECTED" + echo " expected: $TS_EXPECTED{.err}" echo " mountpoint: $TS_MOUNTPOINT" echo fi @@ -466,34 +482,59 @@ function ts_run { "${args[@]}" "$@" } -function ts_gen_diff { +function ts_gen_diff_from { local res=0 + local expected="$1" + local output="$2" + local difffile="$3" - [ -f "$TS_OUTPUT" ] || return 1 - [ -f "$TS_EXPECTED" ] || TS_EXPECTED=/dev/null - - # remove libtool lt- prefixes - sed --in-place 's/^lt\-\(.*\: \)/\1/g' $TS_OUTPUT + diff -u $expected $output > $difffile - [ -d "$TS_DIFFDIR" ] || mkdir -p "$TS_DIFFDIR" - diff -u $TS_EXPECTED $TS_OUTPUT > $TS_DIFF - - if [ $? -ne 0 ] || [ -s $TS_DIFF ]; then + if [ $? -ne 0 ] || [ -s $difffile ]; then res=1 if [ "$TS_SHOWDIFF" == "yes" -a "$TS_KNOWN_FAIL" != "yes" ]; then echo echo "diff-{{{" - cat $TS_DIFF + cat $difffile echo "}}}-diff" echo fi else - rm -f $TS_DIFF; + rm -f $difffile; fi return $res } +function ts_gen_diff { + local status_out=0 + local status_err=0 + + [ -f "$TS_OUTPUT" ] || return 1 + [ -f "$TS_EXPECTED" ] || TS_EXPECTED=/dev/null + + # remove libtool lt- prefixes + sed --in-place 's/^lt\-\(.*\: \)/\1/g' $TS_OUTPUT + sed --in-place 's/^lt\-\(.*\: \)/\1/g' $TS_ERRLOG + + [ -d "$TS_DIFFDIR" ] || mkdir -p "$TS_DIFFDIR" + + ts_gen_diff_from $TS_EXPECTED $TS_OUTPUT $TS_DIFF + status_out=$? + + # error log is fully optional + [ -f "$TS_EXPECTED_ERR" ] || TS_EXPECTED_ERR=/dev/null + [ -f "$TS_ERRLOG" ] || TS_ERRLOG=/dev/null + + ts_gen_diff_from $TS_EXPECTED_ERR $TS_ERRLOG $TS_DIFF.err + status_err=$? + + if [ $status_out -ne 0 -o $status_err -ne 0 ]; then + return 1 + fi + return 0 +} + function tt_gen_mem_report { if [ -n "$TS_VALGRIND_CMD" ]; then grep -q -E 'ERROR SUMMARY: [1-9]' $TS_VGDUMP &> /dev/null @@ -750,7 +791,7 @@ function ts_fdisk_clean { # remove non comparable parts of fdisk output if [ -n "${DEVNAME}" ]; then - sed -i -e "s@${DEVNAME}@@;" $TS_OUTPUT + sed -i -e "s@${DEVNAME}@@;" $TS_OUTPUT $TS_ERRLOG fi sed -i \ @@ -761,7 +802,7 @@ function ts_fdisk_clean { -e 's/Welcome to fdisk.*/Welcome to fdisk ./' \ -e 's/typescript file.*/typescript file ./' \ -e 's@^\(I/O size (minimum/op.* bytes /\) [1-9][0-9]* @\1 @' \ - $TS_OUTPUT + $TS_OUTPUT $TS_ERRLOG } diff --git a/tests/ts/blkdiscard/offsets b/tests/ts/blkdiscard/offsets index 288841199a..24fa8444ed 100755 --- a/tests/ts/blkdiscard/offsets +++ b/tests/ts/blkdiscard/offsets @@ -38,7 +38,7 @@ ts_register_loop_device "$DEVICE" function run_tscmd { local ret - "$@" >> $TS_OUTPUT 2>&1 + "$@" >> $TS_OUTPUT 2>> $TS_ERRLOG ret=$? echo "ret: $ret" >> "$TS_OUTPUT" return $ret diff --git a/tests/ts/blkid/dm-err b/tests/ts/blkid/dm-err index d01f00225e..b9f0e640e3 100755 --- a/tests/ts/blkid/dm-err +++ b/tests/ts/blkid/dm-err @@ -34,7 +34,7 @@ ts_log "Initialize device" echo "0 262144 error" | dmsetup create $DEVNAME ts_log "Probe device" -$TS_CMD_BLKID -p -o udev $DEVICE 2>&1 >> $TS_OUTPUT +$TS_CMD_BLKID -p -o udev $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG echo "Return code: $?" >> $TS_OUTPUT udevadm settle diff --git a/tests/ts/blkid/low-probe b/tests/ts/blkid/low-probe index 38023b8a13..e617c89b14 100755 --- a/tests/ts/blkid/low-probe +++ b/tests/ts/blkid/low-probe @@ -36,7 +36,7 @@ for img in $(ls $TS_SELF/images-fs/*.img.xz | sort); do xz -dc $img > $outimg - $TS_CMD_BLKID -p -o udev $outimg 2>&1 | sort > $TS_OUTPUT + $TS_CMD_BLKID -p -o udev $outimg 2> $TS_ERRLOG | sort > $TS_OUTPUT ts_finalize_subtest done diff --git a/tests/ts/blkid/md-raid0-whole b/tests/ts/blkid/md-raid0-whole index 45c6ee55b0..2b5451da5a 100755 --- a/tests/ts/blkid/md-raid0-whole +++ b/tests/ts/blkid/md-raid0-whole @@ -46,10 +46,10 @@ mdadm -q -S ${MD_DEVICE} &> /dev/null ts_log "Create RAID device" mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=0 \ - --raid-devices=2 ${DEVICE1} ${DEVICE2} >> $TS_OUTPUT 2>&1 + --raid-devices=2 ${DEVICE1} ${DEVICE2} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_log "Create partitions on RAID device" -$TS_CMD_FDISK ${MD_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <&1 | sort >> $TS_OUTPUT +$TS_CMD_BLKID -p -o udev $DEVICE1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT ts_log "Probe second RAID member" -$TS_CMD_BLKID -p -o udev $DEVICE1 2>&1 | sort >> $TS_OUTPUT +$TS_CMD_BLKID -p -o udev $DEVICE1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT ts_log "Stop RAID device" -mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1 +mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_unlock "md" diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part index 3fa6395b04..e4ec58e9e8 100755 --- a/tests/ts/blkid/md-raid1-part +++ b/tests/ts/blkid/md-raid1-part @@ -32,7 +32,7 @@ ts_check_prog "mdadm" ts_scsi_debug_init dev_size_mb=51 sector_size=512 ts_log "Create partitions" -$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG < /dev/null mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=1 \ - --raid-devices=2 ${TS_DEVICE}1 ${TS_DEVICE}2 >> $TS_OUTPUT 2>&1 + --raid-devices=2 ${TS_DEVICE}1 ${TS_DEVICE}2 >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_log "Probe whole-disk" -$TS_CMD_BLKID -p -o udev ${TS_DEVICE} 2>&1 | sort >> $TS_OUTPUT +$TS_CMD_BLKID -p -o udev ${TS_DEVICE} 2>> $TS_ERRLOG | sort >> $TS_OUTPUT ts_log "Probe first RAID member" -$TS_CMD_BLKID -p -o udev ${TS_DEVICE}1 2>&1 | sort >> $TS_OUTPUT +$TS_CMD_BLKID -p -o udev ${TS_DEVICE}1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT ts_log "Probe second RAID member" -$TS_CMD_BLKID -p -o udev ${TS_DEVICE}2 2>&1 | sort >> $TS_OUTPUT +$TS_CMD_BLKID -p -o udev ${TS_DEVICE}2 2>> $TS_ERRLOG | sort >> $TS_OUTPUT -mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1 +mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_unlock "md" diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole index ddf4a6934d..d66de195ad 100755 --- a/tests/ts/blkid/md-raid1-whole +++ b/tests/ts/blkid/md-raid1-whole @@ -48,11 +48,11 @@ udevadm settle ts_log "Create RAID device" mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=1 \ - --raid-devices=2 ${DEVICE1} ${DEVICE2} >> $TS_OUTPUT 2>&1 + --raid-devices=2 ${DEVICE1} ${DEVICE2} >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_log "Create partitions on RAID device" -$TS_CMD_FDISK ${MD_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <&1 | sort >> $TS_OUTPUT +$TS_CMD_BLKID -p -o udev $DEVICE1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT ts_log "Probe second RAID member" -$TS_CMD_BLKID -p -o udev $DEVICE1 2>&1 | sort >> $TS_OUTPUT +$TS_CMD_BLKID -p -o udev $DEVICE1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT ts_log "Stop RAID device" -mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1 +mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_unlock "md" diff --git a/tests/ts/colcrt/functional b/tests/ts/colcrt/functional index 5c97d24416..3e8cc3862c 100755 --- a/tests/ts/colcrt/functional +++ b/tests/ts/colcrt/functional @@ -24,26 +24,26 @@ ts_init "$*" ts_check_test_command "$TS_CMD_COLCRT" ts_init_subtest 'no-options' -$TS_CMD_COLCRT < $TS_SELF/nasty-input >> $TS_OUTPUT 2>&1 -$TS_CMD_COLCRT < $TS_SELF/underlines >> $TS_OUTPUT 2>&1 +$TS_CMD_COLCRT < $TS_SELF/nasty-input >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_COLCRT < $TS_SELF/underlines >> $TS_OUTPUT 2>> $TS_ERRLOG echo "return value: $?" >> $TS_OUTPUT ts_finalize_subtest ts_init_subtest 'no-underlining' -$TS_CMD_COLCRT --no-underlining < $TS_SELF/nasty-input >> $TS_OUTPUT 2>&1 -$TS_CMD_COLCRT --no-underlining < $TS_SELF/underlines >> $TS_OUTPUT 2>&1 +$TS_CMD_COLCRT --no-underlining < $TS_SELF/nasty-input >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_COLCRT --no-underlining < $TS_SELF/underlines >> $TS_OUTPUT 2>> $TS_ERRLOG echo "return value: $?" >> $TS_OUTPUT ts_finalize_subtest ts_init_subtest 'half-lines' -$TS_CMD_COLCRT --half-lines < $TS_SELF/nasty-input >> $TS_OUTPUT 2>&1 -$TS_CMD_COLCRT --half-lines < $TS_SELF/underlines >> $TS_OUTPUT 2>&1 +$TS_CMD_COLCRT --half-lines < $TS_SELF/nasty-input >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_COLCRT --half-lines < $TS_SELF/underlines >> $TS_OUTPUT 2>> $TS_ERRLOG echo "return value: $?" >> $TS_OUTPUT ts_finalize_subtest ts_init_subtest 'short-options' -$TS_CMD_COLCRT - -2 $TS_SELF/nasty-input >> $TS_OUTPUT 2>&1 -$TS_CMD_COLCRT - -2 $TS_SELF/underlines >> $TS_OUTPUT 2>&1 +$TS_CMD_COLCRT - -2 $TS_SELF/nasty-input >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_COLCRT - -2 $TS_SELF/underlines >> $TS_OUTPUT 2>> $TS_ERRLOG echo "return value: $?" >> $TS_OUTPUT ts_finalize_subtest diff --git a/tests/ts/colcrt/regressions b/tests/ts/colcrt/regressions index 2adeea3f37..15117609a4 100755 --- a/tests/ts/colcrt/regressions +++ b/tests/ts/colcrt/regressions @@ -24,7 +24,7 @@ ts_check_prog "timeout" check_input_file() { ts_init_subtest ${1##*/} - LC_ALL=C.UTF-8 timeout 2 $TS_CMD_COLCRT < $1 > $TS_OUTPUT 2>&1 + LC_ALL=C.UTF-8 timeout 2 $TS_CMD_COLCRT < $1 >> $TS_OUTPUT 2>> $TS_ERRLOG echo "return value: $?" >> $TS_OUTPUT ts_finalize_subtest } diff --git a/tests/ts/colrm/rm2-2 b/tests/ts/colrm/rm2-2 index c13e4ecc64..061f5b8738 100755 --- a/tests/ts/colrm/rm2-2 +++ b/tests/ts/colrm/rm2-2 @@ -23,6 +23,6 @@ ts_init "$*" ts_check_test_command "$TS_CMD_COLRM" -printf "a b\nc\td\nef\b\tg\n" | $TS_CMD_COLRM 2 2 > $TS_OUTPUT 2>&1 +printf "a b\nc\td\nef\b\tg\n" | $TS_CMD_COLRM 2 2 >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize diff --git a/tests/ts/column/columnate b/tests/ts/column/columnate index 24e29db114..ebeb0c44f4 100755 --- a/tests/ts/column/columnate +++ b/tests/ts/column/columnate @@ -26,28 +26,27 @@ ts_cd "$TS_OUTDIR" ts_init_subtest "fill-cols-80" -$TS_CMD_COLUMN -c 80 $TS_SELF/files/onecolumn >> $TS_OUTPUT 2>&1 +$TS_CMD_COLUMN -c 80 $TS_SELF/files/onecolumn >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "fill-cols-50" -$TS_CMD_COLUMN -c 50 $TS_SELF/files/onecolumn >> $TS_OUTPUT 2>&1 +$TS_CMD_COLUMN -c 50 $TS_SELF/files/onecolumn >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "fill-cols-250" -$TS_CMD_COLUMN -c 250 $TS_SELF/files/onecolumn >> $TS_OUTPUT 2>&1 +$TS_CMD_COLUMN -c 250 $TS_SELF/files/onecolumn >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "fill-rows-80" -$TS_CMD_COLUMN --fillrows -c 80 $TS_SELF/files/onecolumn >> $TS_OUTPUT 2>&1 +$TS_CMD_COLUMN --fillrows -c 80 $TS_SELF/files/onecolumn >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "fill-rows-50" -$TS_CMD_COLUMN --fillrows -c 50 $TS_SELF/files/onecolumn >> $TS_OUTPUT 2>&1 +$TS_CMD_COLUMN --fillrows -c 50 $TS_SELF/files/onecolumn >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "fill-rows-250" -$TS_CMD_COLUMN --fillrows -c 250 $TS_SELF/files/onecolumn >> $TS_OUTPUT 2>&1 +$TS_CMD_COLUMN --fillrows -c 250 $TS_SELF/files/onecolumn >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_finalize - diff --git a/tests/ts/column/invalid-multibyte b/tests/ts/column/invalid-multibyte index 4fcf44eb31..f3d643e25c 100755 --- a/tests/ts/column/invalid-multibyte +++ b/tests/ts/column/invalid-multibyte @@ -25,6 +25,6 @@ ts_check_test_command "$TS_CMD_COLUMN" ts_cd "$TS_OUTDIR" -printf "\x94\x7e\n" | LC_ALL=C.UTF-8 $TS_CMD_COLUMN >> $TS_OUTPUT 2>&1 +printf "\x94\x7e\n" | LC_ALL=C.UTF-8 $TS_CMD_COLUMN >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize diff --git a/tests/ts/column/multi-file b/tests/ts/column/multi-file index 38cf2b5dae..fa2b2cb99e 100755 --- a/tests/ts/column/multi-file +++ b/tests/ts/column/multi-file @@ -28,7 +28,7 @@ ts_cd "$TS_OUTDIR" $TS_CMD_COLUMN -x -c 50 $TS_SELF/files/fivecols \ $TS_SELF/files/fivecols \ - $TS_SELF/files/fivecols >> $TS_OUTPUT 2>&1 + $TS_SELF/files/fivecols >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize diff --git a/tests/ts/column/table b/tests/ts/column/table index e64dee746e..0ef53888e3 100755 --- a/tests/ts/column/table +++ b/tests/ts/column/table @@ -25,43 +25,43 @@ ts_check_test_command "$TS_CMD_COLUMN" ts_cd "$TS_OUTDIR" ts_init_subtest "default" -$TS_CMD_COLUMN --table $TS_SELF/files/table >> $TS_OUTPUT 2>&1 +$TS_CMD_COLUMN --table $TS_SELF/files/table >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "output-separator" -$TS_CMD_COLUMN --output-separator '|' --table $TS_SELF/files/table >> $TS_OUTPUT 2>&1 +$TS_CMD_COLUMN --output-separator '|' --table $TS_SELF/files/table >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "input-separator" -$TS_CMD_COLUMN --separator ',' --table $TS_SELF/files/table-sep >> $TS_OUTPUT 2>&1 +$TS_CMD_COLUMN --separator ',' --table $TS_SELF/files/table-sep >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "input-separator-space" -$TS_CMD_COLUMN --separator "$(echo -e '\t')" --table $TS_SELF/files/table-sep-space >> $TS_OUTPUT 2>&1 +$TS_CMD_COLUMN --separator "$(echo -e '\t')" --table $TS_SELF/files/table-sep-space >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "empty-lines" -$TS_CMD_COLUMN --table --table-empty-lines $TS_SELF/files/table-empty-lines >> $TS_OUTPUT 2>&1 +$TS_CMD_COLUMN --table --table-empty-lines $TS_SELF/files/table-empty-lines >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "noempty-lines" -$TS_CMD_COLUMN --table $TS_SELF/files/table-empty-lines >> $TS_OUTPUT 2>&1 +$TS_CMD_COLUMN --table $TS_SELF/files/table-empty-lines >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "long" -$TS_CMD_COLUMN --table $TS_SELF/files/mountinfo >> $TS_OUTPUT 2>&1 +$TS_CMD_COLUMN --table $TS_SELF/files/mountinfo >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "hide" $TS_CMD_COLUMN --table $TS_SELF/files/mountinfo \ - --table-hide 1,2,3,4,7,8 >> $TS_OUTPUT 2>&1 + --table-hide 1,2,3,4,7,8 >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "headers" $TS_CMD_COLUMN --table $TS_SELF/files/mountinfo \ --table-columns ID,PARENT,MAJMIN,ROOT,TARGET,VFS-OPTS,PROP,SEP,TYPE,SOURCE,FS-OPTS \ --table-hide SEP,ID,PARENT,ROOT \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "truncate" @@ -70,7 +70,7 @@ $TS_CMD_COLUMN --table $TS_SELF/files/mountinfo \ --table-hide SEP,ID,PARENT,ROOT \ --table-truncate VFS-OPTS,FS-OPTS \ --output-width 80 \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "right" @@ -79,7 +79,7 @@ $TS_CMD_COLUMN --table $TS_SELF/files/mountinfo \ --table-hide SEP,ID,PARENT,ROOT,VFS-OPTS,FS-OPTS,PROP \ --table-right SOURCE,TYPE \ --output-width 80 \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "wrap" @@ -88,7 +88,7 @@ $TS_CMD_COLUMN --table $TS_SELF/files/mountinfo \ --table-hide=SEP,ID,PARENT,ROOT,VFS-OPTS,PROP \ --table-wrap FS-OPTS \ --output-width 110 \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "order" @@ -97,7 +97,7 @@ $TS_CMD_COLUMN --table $TS_SELF/files/mountinfo \ --table-hide=SEP,ID,PARENT,ROOT,PROP,FS-OPTS,MAJMIN \ --table-order TARGET,SOURCE,TYPE,VFS-OPTS \ --output-width 110 \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "tree" @@ -109,19 +109,19 @@ $TS_CMD_COLUMN --table $TS_SELF/files/mountinfo \ --tree-id ID \ --tree-parent PARENT \ --output-width 110 \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "empty-column" -printf ':a:b\n' | $TS_CMD_COLUMN --table --separator ':' --output-separator ':' >> $TS_OUTPUT 2>&1 +printf ':a:b\n' | $TS_CMD_COLUMN --table --separator ':' --output-separator ':' >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "empty-column-at-eol" -printf '|' | $TS_CMD_COLUMN --separator '|' --output-separator '|' --table >> $TS_OUTPUT 2>&1 +printf '|' | $TS_CMD_COLUMN --separator '|' --output-separator '|' --table >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "empty-column-at-eol2" -printf '||' | $TS_CMD_COLUMN --separator '|' --output-separator '|' --table >> $TS_OUTPUT 2>&1 +printf '||' | $TS_CMD_COLUMN --separator '|' --output-separator '|' --table >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_finalize diff --git a/tests/ts/cramfs/doubles b/tests/ts/cramfs/doubles index cf6d09b752..8a1b7bb886 100755 --- a/tests/ts/cramfs/doubles +++ b/tests/ts/cramfs/doubles @@ -41,7 +41,7 @@ echo hello > $IMAGE_SRC/a echo hello > $IMAGE_SRC/b ts_log "create cramfs image" -$TS_CMD_MKCRAMFS $IMAGE_SRC $IMAGE_PATH >> $TS_OUTPUT 2>&1 +$TS_CMD_MKCRAMFS $IMAGE_SRC $IMAGE_PATH >> $TS_OUTPUT 2>> $TS_ERRLOG [ -s "$IMAGE_PATH" ] || ts_die "Cannot create $IMAGE_PATH" ts_mount "cramfs" -r $IMAGE_PATH $TS_MOUNTPOINT diff --git a/tests/ts/cramfs/fsck-bad-header b/tests/ts/cramfs/fsck-bad-header index c71782bde8..95d8274ff4 100755 --- a/tests/ts/cramfs/fsck-bad-header +++ b/tests/ts/cramfs/fsck-bad-header @@ -48,11 +48,11 @@ function fsck_loop_sizes() shift 2 # the rest are sizes to loop over for size in "$@"; do - ts_log "## size: $size" + ts_log_both "## size: $size" cp -a "$IMAGE_FILE" "$IMAGE_FILE.tmp" num2binary "$size" $endian | dd of="$IMAGE_FILE.tmp" bs=1 seek="$seek" count=4 conv=notrunc &> /dev/null - $TS_CMD_FSCKCRAMFS "$IMAGE_FILE.tmp" >> $TS_OUTPUT 2>&1 + $TS_CMD_FSCKCRAMFS "$IMAGE_FILE.tmp" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_log "ret: $? " done diff --git a/tests/ts/cramfs/fsck-endianness b/tests/ts/cramfs/fsck-endianness index db287f9d0f..bcfb46c905 100755 --- a/tests/ts/cramfs/fsck-endianness +++ b/tests/ts/cramfs/fsck-endianness @@ -40,11 +40,11 @@ test_image() { rm -rf "$IMAGE_DATA" ts_log "extract from $FROM_ENDIANNESS endian" - $TS_CMD_FSCKCRAMFS -v -b 4096 --extract=$IMAGE_DATA $FROM_IMAGE | head -n1 | cut -d" " -f4 >> $TS_OUTPUT 2>&1 + $TS_CMD_FSCKCRAMFS -v -b 4096 --extract=$IMAGE_DATA $FROM_IMAGE | head -n1 | cut -d" " -f4 >> $TS_OUTPUT 2>> $TS_ERRLOG ts_log "create $TO_ENDIANNESS endian" $TS_CMD_MKCRAMFS -N "$TO_ENDIANNESS" -b 4096 "$IMAGE_DATA" \ - "$IMAGE_CREATED" >> $TS_OUTPUT 2>&1 + "$IMAGE_CREATED" >> $TS_OUTPUT 2>> $TS_ERRLOG "$TS_HELPER_MD5" < "$IMAGE_CREATED" >> $TS_OUTPUT diff --git a/tests/ts/cramfs/mkfs b/tests/ts/cramfs/mkfs index cbde36810f..3453d89d7c 100755 --- a/tests/ts/cramfs/mkfs +++ b/tests/ts/cramfs/mkfs @@ -71,13 +71,13 @@ find . -type f -exec md5sum {} \; | sort >> $TS_OUTPUT echo >> $TS_OUTPUT ts_log "create cramfs image" -$TS_CMD_MKCRAMFS -n $LABEL $IMAGE_SRC $IMAGE_PATH >> $TS_OUTPUT 2>&1 +$TS_CMD_MKCRAMFS -n $LABEL $IMAGE_SRC $IMAGE_PATH >> $TS_OUTPUT 2>> $TS_ERRLOG [ -s "$IMAGE_PATH" ] || ts_die "Cannot create $IMAGE_PATH" ts_cd "$TS_OUTDIR" ts_log "count MD5 from the image" -MD5_OUT=$("$TS_HELPER_MD5" < "$IMAGE_NAME") >> $TS_OUTPUT 2>&1 +MD5_OUT=$("$TS_HELPER_MD5" < "$IMAGE_NAME") >> $TS_OUTPUT 2>> $TS_ERRLOG if [ "$MD5_EXP" != "$MD5_OUT" -a "$MD5_EXP" != "unknown" ]; then ts_log "is $MD5_OUT, should be $MD5_EXP" fi diff --git a/tests/ts/cramfs/mkfs-endianness b/tests/ts/cramfs/mkfs-endianness index c5110867e2..e3913d65eb 100755 --- a/tests/ts/cramfs/mkfs-endianness +++ b/tests/ts/cramfs/mkfs-endianness @@ -34,7 +34,7 @@ test_image() { ts_log "create $TO_ENDIANNESS endian" $TS_CMD_MKCRAMFS -N "$TO_ENDIANNESS" -b 4096 "$IMAGE_DATA" \ - "$IMAGE_CREATED" >> $TS_OUTPUT 2>&1 + "$IMAGE_CREATED" >> $TS_OUTPUT 2>> $TS_ERRLOG $TS_CMD_HEXDUMP -C $IMAGE_CREATED >> $TS_OUTPUT diff --git a/tests/ts/dmesg/indentation b/tests/ts/dmesg/indentation index 9952c651d1..0e026d02c8 100755 --- a/tests/ts/dmesg/indentation +++ b/tests/ts/dmesg/indentation @@ -23,18 +23,18 @@ ts_check_test_command "$TS_HELPER_DMESG" export TZ="GMT" export DMESG_TEST_BOOTIME="1234567890.123456" -$TS_HELPER_DMESG -F $TS_SELF/newlines > $TS_OUTPUT 2>&1 +$TS_HELPER_DMESG -F $TS_SELF/newlines >> $TS_OUTPUT 2>> $TS_ERRLOG -$TS_HELPER_DMESG -F $TS_SELF/newlines -x >> $TS_OUTPUT 2>&1 +$TS_HELPER_DMESG -F $TS_SELF/newlines -x >> $TS_OUTPUT 2>> $TS_ERRLOG -$TS_HELPER_DMESG --time-format=delta --file $TS_SELF/newlines >> $TS_OUTPUT 2>&1 +$TS_HELPER_DMESG --time-format=delta --file $TS_SELF/newlines >> $TS_OUTPUT 2>> $TS_ERRLOG -$TS_HELPER_DMESG --time-format=notime --file $TS_SELF/newlines >> $TS_OUTPUT 2>&1 +$TS_HELPER_DMESG --time-format=notime --file $TS_SELF/newlines >> $TS_OUTPUT 2>> $TS_ERRLOG -$TS_HELPER_DMESG --time-format=reltime --file $TS_SELF/newlines >> $TS_OUTPUT 2>&1 +$TS_HELPER_DMESG --time-format=reltime --file $TS_SELF/newlines >> $TS_OUTPUT 2>> $TS_ERRLOG -$TS_HELPER_DMESG --time-format=ctime --file $TS_SELF/newlines >> $TS_OUTPUT 2>&1 +$TS_HELPER_DMESG --time-format=ctime --file $TS_SELF/newlines >> $TS_OUTPUT 2>> $TS_ERRLOG -$TS_HELPER_DMESG --time-format=iso --file $TS_SELF/newlines >> $TS_OUTPUT 2>&1 +$TS_HELPER_DMESG --time-format=iso --file $TS_SELF/newlines >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize diff --git a/tests/ts/fdisk/align-512-4K b/tests/ts/fdisk/align-512-4K index c312e34f14..b6e695f985 100755 --- a/tests/ts/fdisk/align-512-4K +++ b/tests/ts/fdisk/align-512-4K @@ -35,7 +35,7 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3 DEVNAME=$(basename $TS_DEVICE) ts_log "Create partitions" -$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>&1 +cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE diff --git a/tests/ts/fdisk/align-512-4K-63 b/tests/ts/fdisk/align-512-4K-63 index b84780bda6..e6a4af76be 100755 --- a/tests/ts/fdisk/align-512-4K-63 +++ b/tests/ts/fdisk/align-512-4K-63 @@ -35,7 +35,7 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3 lowest_aligned=7 DEVNAME=$(basename $TS_DEVICE) ts_log "Create partitions" -$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>&1 +cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md index 7f60a654f2..1cb53b7e4a 100755 --- a/tests/ts/fdisk/align-512-4K-md +++ b/tests/ts/fdisk/align-512-4K-md @@ -36,7 +36,7 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3 DEVNAME=$(basename $TS_DEVICE) ts_log "Create partitions" -$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>&1 +cat /sys/block/${DEVNAME}/${DEVNAME}{1,2}/alignment_offset >> $TS_OUTPUT 2>> $TS_ERRLOG ts_lock "md" @@ -65,11 +65,11 @@ mdadm -q -S ${MD_DEVICE} &> /dev/null udevadm settle mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 \ - --level=0 --raid-devices=2 ${TS_DEVICE}1 ${TS_DEVICE}2 >> $TS_OUTPUT 2>&1 + --level=0 --raid-devices=2 ${TS_DEVICE}1 ${TS_DEVICE}2 >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_log "Create partitions (MD)" -$TS_CMD_FDISK ${MD_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>&1 +cat /sys/block/${MD_DEVNAME}/${MD_DEVNAME}p{1,2}/alignment_offset >> $TS_OUTPUT 2>> $TS_ERRLOG -mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1 +mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_unlock "md" diff --git a/tests/ts/fdisk/align-512-512 b/tests/ts/fdisk/align-512-512 index 19506ea885..94a4c1fc8d 100755 --- a/tests/ts/fdisk/align-512-512 +++ b/tests/ts/fdisk/align-512-512 @@ -34,7 +34,7 @@ ts_device_init 50 DEVICE=$TS_LODEV ts_log "Create partitions" -$TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>&1 +cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE diff --git a/tests/ts/fdisk/bsd b/tests/ts/fdisk/bsd index 953b087a22..0444042a84 100755 --- a/tests/ts/fdisk/bsd +++ b/tests/ts/fdisk/bsd @@ -89,38 +89,38 @@ function print_bsd_layout { ts_log "Initialize empty image" TEST_IMAGE_NAME=$(ts_image_init 10) -$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 +$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_log "Create new DOS partition table" echo -e "${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_SETID}${FDISK_CMD_WRITE_CLOSE}" \ | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 +$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_log "Create 1st primary partition" echo -e "${FDISK_CMD_CREATE_PRIMARY1}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 +$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_log "Create 2st primary partition" echo -e "${FDISK_CMD_CREATE_PRIMARY2}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 +$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_log "Set 2nd partition type" echo -e "${FDISK_CMD_CHANGE_PART2TYPE}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 +$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_log "Create default BSD" echo -e "${FDISK_CMD_BSD_CREATE}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 +$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG print_bsd_layout @@ -129,13 +129,13 @@ echo -e "${FDISK_CMD_BSD_CREATE_PART}${FDISK_CMD_WRITE_CLOSE}" | \ echo -e "${FDISK_CMD_BSD_PARTTYPE}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 +$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG print_bsd_layout echo -e "${FDISK_CMD_BSD_LIST_TYPES}" | \ $TS_CMD_FDISK ${TEST_IMAGE_NAME} | \ - sed 's/Reading .*//g; s/Welcome to fdisk .*//' >> $TS_OUTPUT 2>&1 + sed 's/Reading .*//g; s/Welcome to fdisk .*//' >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize diff --git a/tests/ts/fdisk/gpt b/tests/ts/fdisk/gpt index 62dce6d6fb..ee8d83f1bc 100755 --- a/tests/ts/fdisk/gpt +++ b/tests/ts/fdisk/gpt @@ -36,7 +36,7 @@ FDISK_CMD_CREATE_PART="n\n2\n\n\n" # create 2nd partition function print_layout { echo -ne "\n---layout----------\n" >> $TS_OUTPUT - $TS_CMD_FDISK -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 + $TS_CMD_FDISK -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG echo -ne "-------------------\n\n" >> $TS_OUTPUT } diff --git a/tests/ts/fdisk/gpt-resize b/tests/ts/fdisk/gpt-resize index b8319817d8..a5d248a3d0 100755 --- a/tests/ts/fdisk/gpt-resize +++ b/tests/ts/fdisk/gpt-resize @@ -36,7 +36,7 @@ ts_device_init 10 DEVICE=$TS_LODEV # create GPT with one partition -echo ",," | $TS_CMD_SFDISK --no-reread --no-tell-kernel --label gpt $DEVICE >> $TS_OUTPUT 2>&1 +echo ",," | $TS_CMD_SFDISK --no-reread --no-tell-kernel --label gpt $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle # enlarge the image @@ -48,16 +48,16 @@ udevadm settle $TS_CMD_LOSETUP --set-capacity $DEVICE udevadm settle -echo -e "\n\n----- fixing after resize: -----\n\n" >> $TS_OUTPUT +ts_log_both "----- fixing after resize: -----" # create another GPT partition on new free space (all default) -echo -e 'n\n\n\n\nw\n' | $TS_CMD_FDISK $DEVICE >> $TS_OUTPUT 2>&1 +echo -e 'n\n\n\n\nw\n' | $TS_CMD_FDISK $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle -echo -e "\n\n----- list result: -----\n\n" >> $TS_OUTPUT +ts_log "----- list result: -----" -$TS_CMD_FDISK --list $DEVICE 2>&1 >> $TS_OUTPUT +$TS_CMD_FDISK --list $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $DEVICE ts_finalize diff --git a/tests/ts/fdisk/mbr-dos-mode b/tests/ts/fdisk/mbr-dos-mode index 219df2f8e6..13be20b7d9 100755 --- a/tests/ts/fdisk/mbr-dos-mode +++ b/tests/ts/fdisk/mbr-dos-mode @@ -51,82 +51,82 @@ function print_layout { # ts_log "Initialize empty image" TEST_IMAGE_NAME=$(ts_image_init 10) -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG ts_log "Create new DOS partition table" echo -e "${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_INIT}${FDISK_CMD_WRITE_CLOSE}" \ | $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_log "Create primary partition" echo -e "${FDISK_CMD_CREATE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_log "Set partition type" echo -e "${FDISK_CMD_CHANGE_PARTTYPE}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_log "Set primary partition active" echo -e "${FDISK_CMD_SET_ACTIVE}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_log "Re-create primary partition" echo -e "d\n${FDISK_CMD_CREATE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_log "Create extended partition" echo -e "${FDISK_CMD_CREATE_EXTENDED}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_log "Create logical partitions" echo -e "${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_WRITE_CLOSE}" \ | $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_log "Delete logical partitions" echo -e "${FDISK_CMD_DELETE_LOGICALS}${FDISK_CMD_WRITE_CLOSE}" \ | $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_log "Create another logical partition" echo -e "${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_WRITE_CLOSE}" \ | $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_log "Delete primary partition" echo -e "${FDISK_CMD_DELETE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" \ | $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_log "Delete extended partition" echo -e "${FDISK_CMD_DELETE_EXTENDED}${FDISK_CMD_WRITE_CLOSE}" \ | $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout diff --git a/tests/ts/fdisk/mbr-nondos-mode b/tests/ts/fdisk/mbr-nondos-mode index 8fb09f1ce9..5f469623e6 100755 --- a/tests/ts/fdisk/mbr-nondos-mode +++ b/tests/ts/fdisk/mbr-nondos-mode @@ -60,14 +60,14 @@ function print_layout { ts_init_subtest "empty-pt" ts_log "Initialize empty image" TEST_IMAGE_NAME=$(ts_image_init 20) # 20 MiB -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG # need to run init twice, to change system ID after new label, otherwise system # ID will be random and will screw up md5's ts_log "Create new DOS partition table" echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_INIT}${FDISK_CMD_WRITE_CLOSE}" \ | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_finalize_subtest @@ -76,7 +76,7 @@ ts_init_subtest "1st-primary" ts_log "Create 1st primary partition" echo -e "${FDISK_CMD_CREATE_1PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_finalize_subtest @@ -85,7 +85,7 @@ ts_init_subtest "1st-active" ts_log "Set primary partition active" echo -e "${FDISK_CMD_SET_ACTIVE}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_finalize_subtest @@ -94,7 +94,7 @@ ts_init_subtest "1st-primary-recreate" ts_log "Re-create 1st primary partition" echo -e "d\n${FDISK_CMD_CREATE_1PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_finalize_subtest @@ -103,7 +103,7 @@ ts_init_subtest "2nd-primary" ts_log "Create 2nd primary partition" echo -e "${FDISK_CMD_CREATE_2PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_finalize_subtest @@ -112,7 +112,7 @@ ts_init_subtest "extended" ts_log "Create extended partition" echo -e "${FDISK_CMD_CREATE_EXTENDED}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_finalize_subtest @@ -121,7 +121,7 @@ ts_init_subtest "logical" ts_log "Create logical partitions" echo -e "${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_WRITE_CLOSE}" \ | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_finalize_subtest @@ -130,7 +130,7 @@ ts_init_subtest "logical-delete" ts_log "Delete logical partitions" echo -e "${FDISK_CMD_DELETE_LOGICALS}${FDISK_CMD_WRITE_CLOSE}" \ | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_finalize_subtest @@ -139,7 +139,7 @@ ts_init_subtest "logical-recreate" ts_log "Create another logical partition" echo -e "${FDISK_CMD_CREATE_LOGICAL}${FDISK_CMD_WRITE_CLOSE}" \ | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_finalize_subtest @@ -148,7 +148,7 @@ ts_init_subtest "1st-primary-delete" ts_log "Delete primary partition" echo -e "${FDISK_CMD_DELETE_1PRIMARY}${FDISK_CMD_WRITE_CLOSE}" \ | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_finalize_subtest @@ -157,7 +157,7 @@ ts_init_subtest "1nd-primary-delete" ts_log "Delete primary partition" echo -e "${FDISK_CMD_DELETE_2PRIMARY}${FDISK_CMD_WRITE_CLOSE}" \ | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_finalize_subtest @@ -166,7 +166,7 @@ ts_init_subtest "extended-delete" ts_log "Delete extended partition" echo -e "${FDISK_CMD_DELETE_EXTENDED}${FDISK_CMD_WRITE_CLOSE}" \ | $TS_CMD_FDISK -c=dos -u=cylinders ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_finalize_subtest diff --git a/tests/ts/fdisk/oddinput b/tests/ts/fdisk/oddinput index 7b0c8bfd4b..f47f970b69 100755 --- a/tests/ts/fdisk/oddinput +++ b/tests/ts/fdisk/oddinput @@ -25,25 +25,29 @@ ts_check_test_command "$TS_HELPER_MD5" #set -x -ts_log "Initialize empty image" +ts_log "---Initialize empty image" TEST_IMAGE_NAME=$(ts_image_init 10) -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG # # Note that since 2.23 the DOS-mode has effect only if there is a MBR on the device. # -ts_log "Empty image listing" # this should report empty partition table +ts_log "---Empty image listing" # this should report empty partition table # TEST_IMAGE_NAME has absolute path, and is by definition different on each computer, we need to sed it away -$TS_CMD_FDISK -c=dos -u=cylinders -l ${TEST_IMAGE_NAME} 2>&1 | sed -e "s/${TEST_IMAGE_NAME//\//\\/}/testimage/" >> $TS_OUTPUT +$TS_CMD_FDISK -c=dos -u=cylinders -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG +sed -i -e "s/${TEST_IMAGE_NAME//\//\\/}/testimage/" $TS_OUTPUT $TS_ERRLOG -ts_log "Nonexistent file" # this originally does absolutely nothing -$TS_CMD_FDISK -c=dos -u=cylinders -l _a_file_that_does_not_exist_ 2>&1 | - sed -e "s@$($TS_HELPER_STRERROR ENOENT)@ENOENT@" >> $TS_OUTPUT +# +# Errors +# +ts_logerr "---Nonexistent file" +$TS_CMD_FDISK -c=dos -u=cylinders -l _a_file_that_does_not_exist_ >> $TS_OUTPUT 2>> $TS_ERRLOG +sed -i -e "s@$($TS_HELPER_STRERROR ENOENT)@ENOENT@" $TS_OUTPUT $TS_ERRLOG -ts_log "Too small file" # same here +ts_logerr "---Too small file" echo "This file is too small" >> oddinput.toosmall -$TS_CMD_FDISK -c=dos -u=cylinders -l oddinput.toosmall 2>&1 | - sed -e "s@$($TS_HELPER_STRERROR ENOTTY)@ENOTTY@" >> $TS_OUTPUT +$TS_CMD_FDISK -c=dos -u=cylinders -l oddinput.toosmall >> $TS_OUTPUT 2>> $TS_ERRLOG +sed -i -e "s@$($TS_HELPER_STRERROR ENOTTY)@ENOTTY@" $TS_OUTPUT $TS_ERRLOG rm oddinput.toosmall ts_finalize diff --git a/tests/ts/fdisk/sunlabel b/tests/ts/fdisk/sunlabel index d6b1033669..edf7f2eac3 100755 --- a/tests/ts/fdisk/sunlabel +++ b/tests/ts/fdisk/sunlabel @@ -39,54 +39,54 @@ FDISK_OPTIONS="-H 1 -S 63 -u=cylinders" ts_log "Initialize empty image" TEST_IMAGE_NAME=$(ts_image_init 10) -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG ts_log "Create new SUN partition table" echo -e "${FDISK_CMD_INIT}${FDISK_CMD_DELETEALL}${FDISK_CMD_WRITE_CLOSE}" \ | $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG $TS_CMD_FDISK ${FDISK_OPTIONS} -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT ts_log "Create first partition" echo -e "${FDISK_CMD_CREATE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG $TS_CMD_FDISK ${FDISK_OPTIONS} -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT ts_log "Set partition sysid" echo -e "${FDISK_CMD_CHANGE_SYSID}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG $TS_CMD_FDISK ${FDISK_OPTIONS} -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT ts_log "Set first partition readonly" echo -e "${FDISK_CMD_TOGGLE_READONLY}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG $TS_CMD_FDISK ${FDISK_OPTIONS} -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT ts_log "Set first partition mountable" echo -e "${FDISK_CMD_TOGGLE_MOUNTABLE}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG $TS_CMD_FDISK ${FDISK_OPTIONS} -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT ts_log "Create second partition" echo -e "${FDISK_CMD_CREATE_SECONDARY}${FDISK_CMD_WRITE_CLOSE}" | \ - $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 -ts_image_md5sum >> $TS_OUTPUT 2>&1 + $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG $TS_CMD_FDISK ${FDISK_OPTIONS} -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT ts_log "Delete all partitions" echo -e "${FDISK_CMD_DELETEALL}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null -ts_image_md5sum >> $TS_OUTPUT 2>&1 +ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize diff --git a/tests/ts/fincore/count b/tests/ts/fincore/count index 46700a32e7..fb35b0fb8f 100755 --- a/tests/ts/fincore/count +++ b/tests/ts/fincore/count @@ -11,11 +11,6 @@ ts_check_test_command "$TS_HELPER_SYSINFO" # Send patch if you know how to keep it portable and robust. Thanks. TS_KNOWN_FAIL="yes" -function header -{ - echo "[" "$1" "]" -} - function footer { echo "return value: $1" @@ -105,6 +100,7 @@ WINDOW_SIZE=$(( 32 * 1024 * PAGE_SIZE )) # we use PAGE_SIZE dependent output for a few systems if test -f "$TS_EXPECTED.$PAGE_SIZE"; then TS_EXPECTED+=".$PAGE_SIZE" + TS_EXPECTED_ERR+=".$PAGE_SIZE" OUT_COLUMNS="PAGES,SIZE,FILE" else TS_EXPECTED+=".nosize" @@ -124,108 +120,108 @@ input= input=no_such_file INPUT="${INPUT} ${input}" - header "NO EXCITING FILE" + ts_log_both "[ NO EXCITING FILE ]" $TS_CMD_FINCORE --output $OUT_COLUMNS --bytes --noheadings $input footer "$?" -} >> $TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG { run_dd_test "EMPTY FILE" 0 -} >> $TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG { run_dd_test "PAGESIZE -1 (incore)" $(( PAGE_SIZE - 1 )) -} >> $TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG { run_dd_test "JUST PAGESIZE(incore)" $(( PAGE_SIZE )) -} >> $TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG { run_dd_test "JUST PAGESIZE(directio)" $(( PAGE_SIZE )) "oflag=direct" -} >> $TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG { run_dd_test "TWO PAGES(incore)" $(( 2 * PAGE_SIZE )) -} >> $TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG { run_dd_test "TWO PAGES(directio)" $(( 2 * PAGE_SIZE )) "oflag=direct" -} >> $TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG { run_dd_dd_test "TWO PAGES(mixed directio/incore)" \ oflag=direct \ "oflag=append seek=1" -} >> $TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG { run_dd_dd_test "TWO PAGES(mixed incore/directio)" \ "" \ "oflag=direct,append seek=1" -} >> $TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG { hole_count=$(( WINDOW_SIZE / PAGE_SIZE - 2 )) run_dd_dd_test "WINDOW SIZE(incore-sparse-incore)" \ "" \ "oflag=append seek=$hole_count" -} >> $TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG { hole_count=$(( WINDOW_SIZE / PAGE_SIZE - 2 )) run_dd_dd_test "WINDOW SIZE(directio-sparse-directio)" \ "oflag=direct" \ "oflag=append,direct seek=$hole_count" -} >> $TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG { hole_count=$(( WINDOW_SIZE / PAGE_SIZE - 2 )) run_dd_dd_test "WINDOW SIZE(incore-sparse-directio)" \ "" \ "oflag=append,direct seek=$hole_count" -} >> $TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG { hole_count=$(( WINDOW_SIZE / PAGE_SIZE - 2 )) run_dd_dd_test "WINDOW SIZE(directio-sparse-incore)" \ "oflag=direct" \ "oflag=append seek=$hole_count" -} >> $TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG { hole_count=$(( WINDOW_SIZE / PAGE_SIZE - 1 )) run_dd_dd_test "WINDOW SIZE + 1 page(incore-sparse-incore)" \ "" \ "oflag=append seek=$hole_count" -} >> $TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG { hole_count=$(( WINDOW_SIZE / PAGE_SIZE - 1 )) run_dd_dd_test "WINDOW SIZE + 1 page(directio-sparse-directio)" \ "oflag=direct" \ "oflag=append,direct seek=$hole_count" -} >> $TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG { hole_count=$(( WINDOW_SIZE / PAGE_SIZE - 1 )) run_dd_dd_test "WINDOW SIZE + 1 page(incore-sparse-directio)" \ "" \ "oflag=append,direct seek=$hole_count" -} >> $TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG { hole_count=$(( WINDOW_SIZE / PAGE_SIZE - 1 )) run_dd_dd_test "WINDOW SIZE + 1 page(directio-sparse-incore)" \ "oflag=direct" \ "oflag=append seek=$hole_count" -} >> $TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG { - header "MULTIPLE FILES" + ts_log_both "[ MULTIPLE FILES ]" $TS_CMD_FINCORE --output $OUT_COLUMNS --bytes $INPUT footer "$?" -} >> $TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG rm -f $INPUT ts_finalize diff --git a/tests/ts/fsck/ismounted b/tests/ts/fsck/ismounted index 7d1fe62736..4ace9a0ad1 100755 --- a/tests/ts/fsck/ismounted +++ b/tests/ts/fsck/ismounted @@ -40,10 +40,10 @@ ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT -$TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG # test by ismounted.c -$TS_HELPER_ISMOUNTED $DEVICE | awk '{print $1}' >> $TS_OUTPUT 2>&1 +$TS_HELPER_ISMOUNTED $DEVICE | awk '{print $1}' >> $TS_OUTPUT 2>> $TS_ERRLOG $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" diff --git a/tests/ts/getopt/basic b/tests/ts/getopt/basic index be2928bc1a..a505b89f66 100755 --- a/tests/ts/getopt/basic +++ b/tests/ts/getopt/basic @@ -41,9 +41,9 @@ while true ; do --) shift ; break ;; *) echo "Internal error!"; break;; esac -done >> $TS_OUTPUT 2>&1 +done >> $TS_OUTPUT 2>> $TS_ERRLOG -echo "Remaining arguments:" >> $TS_OUTPUT 2>&1 -for arg do echo '--> '"\`$arg'" >> $TS_OUTPUT 2>&1; done +echo "Remaining arguments:" >> $TS_OUTPUT 2>> $TS_ERRLOG +for arg do echo '--> '"\`$arg'" >> $TS_OUTPUT 2>> $TS_ERRLOG; done ts_finalize diff --git a/tests/ts/getopt/options b/tests/ts/getopt/options index fee51195e2..7534d7a758 100755 --- a/tests/ts/getopt/options +++ b/tests/ts/getopt/options @@ -29,60 +29,60 @@ function gnu_getopt_clean() { -e "s/unrecognized option: \(.\)$/invalid option -- '\1'/" \ -e "s/option requires an argument: \(.\)$/option requires an argument -- '\1'/" \ -e "s/unrecognized option: \([^'-].\{1,\}\)$/unrecognized option '--\1'/" \ - "$TS_OUTPUT" + $TS_OUTPUT $TS_ERRLOG } ts_init_subtest alternative_option_clash -$TS_CMD_GETOPT -a -o abcde -l abcde -- -a -ab -abc -ac >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT -a -o abcde -l abcde -- -a -ab -abc -ac >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest ts_init_subtest alternative_option_long -$TS_CMD_GETOPT --alternative -o a -l one,two:,three::,four:: -- -a -one -two=MANDATORY -three=OPTIONAL >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT --alternative -o a -l one,two:,three::,four:: -- -a -one -two=MANDATORY -three=OPTIONAL >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest ts_init_subtest alternative_option_short -$TS_CMD_GETOPT -a -o a -l one,two:,three::,four:: -- -a -one -two=MANDATORY -three=OPTIONAL >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT -a -o a -l one,two:,three::,four:: -- -a -one -two=MANDATORY -three=OPTIONAL >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest ts_init_subtest invalid_getopt_option -$TS_CMD_GETOPT -b >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT -b >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT sed -i '1,1s/.*\///' $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest ts_init_subtest invocation_model_one -$TS_CMD_GETOPT abc:d::e::f::g: ARG0 -b ARG1 -d -eOPTIONAL1 -f NOT_OPTIONAL ARG2 -a -c -ISREQUIRED ARG3 -g "BECOMES THREE ARGUMENTS" >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT abc:d::e::f::g: ARG0 -b ARG1 -d -eOPTIONAL1 -f NOT_OPTIONAL ARG2 -a -c -ISREQUIRED ARG3 -g "BECOMES THREE ARGUMENTS" >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest ts_init_subtest invocation_model_three_as_one -$TS_CMD_GETOPT -o abc:d::e::f::g: -- ARG0 -b ARG1 -d -eOPTIONAL1 -f NOT_OPTIONAL ARG2 -a -c -ISREQUIRED ARG3 -g "BECOMES THREE ARGUMENTS" >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT -o abc:d::e::f::g: -- ARG0 -b ARG1 -d -eOPTIONAL1 -f NOT_OPTIONAL ARG2 -a -c -ISREQUIRED ARG3 -g "BECOMES THREE ARGUMENTS" >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest ts_init_subtest invocation_model_two_as_one -$TS_CMD_GETOPT -- abc:d::e::f::g: ARG0 -b ARG1 -d -eOPTIONAL1 -f NOT_OPTIONAL ARG2 -a -c -ISREQUIRED ARG3 -g "BECOMES THREE ARGUMENTS" >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT -- abc:d::e::f::g: ARG0 -b ARG1 -d -eOPTIONAL1 -f NOT_OPTIONAL ARG2 -a -c -ISREQUIRED ARG3 -g "BECOMES THREE ARGUMENTS" >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest ts_init_subtest invocation_without_parameters -$TS_CMD_GETOPT >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest ts_init_subtest long_option_ambiguous_1 -$TS_CMD_GETOPT -o a -l long1,long2 -- --long >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT -o a -l long1,long2 -- --long >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT sed -i -e '1,1s/.*\///' -e "1s/ambiguous$/ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT sed -i -e "1s/is ambiguous: long$/'--long' is ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT @@ -90,37 +90,37 @@ gnu_getopt_clean ts_finalize_subtest ts_init_subtest longopts -$TS_CMD_GETOPT -o a -l long1,secondlong:,thirdlong::,abbreviation: -- --long1 EXTRA1 --thirdlong=ARGUMENT --secondlong=ARG --abbr ABBRARG -a >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT -o a -l long1,secondlong:,thirdlong::,abbreviation: -- --long1 EXTRA1 --thirdlong=ARGUMENT --secondlong=ARG --abbr ABBRARG -a >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest ts_init_subtest name_option_long -$TS_CMD_GETOPT -n THIS_PROGRAM -o a -l long -- -b --long --whatever -a >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT -n THIS_PROGRAM -o a -l long -- -b --long --whatever -a >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest ts_init_subtest name_option_short -$TS_CMD_GETOPT --name THIS_PROGRAM -o a -l long -- -b --long --whatever -a >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT --name THIS_PROGRAM -o a -l long -- -b --long --whatever -a >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest ts_init_subtest quiet_option_long -$TS_CMD_GETOPT --quiet -o a,b: -l long1,long2 -- -c --unknown --long -b >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT --quiet -o a,b: -l long1,long2 -- -c --unknown --long -b >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest ts_init_subtest quiet_option_short -$TS_CMD_GETOPT -q -o a,b: -l long1,long2 -- -c --unknown --long -b >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT -q -o a,b: -l long1,long2 -- -c --unknown --long -b >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest ts_init_subtest quiet_output_option_long -$TS_CMD_GETOPT --quiet-output -o a,b: -l long1,long2 -- -c --unknown --long -b >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT --quiet-output -o a,b: -l long1,long2 -- -c --unknown --long -b >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT sed -i -e '1,4s/.*\///' -e "3s/ambiguous$/ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT sed -i -e "3s/is ambiguous: long$/'--long' is ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT @@ -128,7 +128,7 @@ gnu_getopt_clean ts_finalize_subtest ts_init_subtest quiet_output_option_short -$TS_CMD_GETOPT -Q -o a,b: -l long1,long2 -- -c --unknown --long -b >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT -Q -o a,b: -l long1,long2 -- -c --unknown --long -b >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT sed -i -e '1,4s/.*\///' -e "3s/ambiguous$/ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT sed -i "3s/is ambiguous: long$/'--long' is ambiguous; possibilities: '--long1' '--long2'/" $TS_OUTPUT @@ -136,19 +136,19 @@ gnu_getopt_clean ts_finalize_subtest ts_init_subtest same_long_short_options -$TS_CMD_GETOPT -o a -l a -- -a --a >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT -o a -l a -- -a --a >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest ts_init_subtest test_for_enhanced_getopt -$TS_CMD_GETOPT -T >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT -T >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest ts_init_subtest unknown_options -$TS_CMD_GETOPT -o a -l long -- -b --long --whatever -a >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT -o a -l long -- -b --long --whatever -a >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT sed -i '1,2s/.*\///' $TS_OUTPUT gnu_getopt_clean @@ -158,7 +158,7 @@ ts_init_subtest unquoted_option_bash $TS_CMD_GETOPT -s bash -u -o a: -l long1: -- -a '$?!* ' --long \"\\\' 'More than one -line' >> $TS_OUTPUT 2>&1 +line' >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest @@ -167,7 +167,7 @@ ts_init_subtest unquoted_option_tcsh $TS_CMD_GETOPT -s tcsh --unquoted -o a: -l long1: -- -a '$?!* ' --long \"\\\' 'More than one -line' >> $TS_OUTPUT 2>&1 +line' >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest @@ -176,7 +176,7 @@ ts_init_subtest weird_quoting_bash $TS_CMD_GETOPT -s bash -o a: -l long1: -- -a '$?!* ' --long \"\\\' 'More than one -line' >> $TS_OUTPUT 2>&1 +line' >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest @@ -185,46 +185,46 @@ ts_init_subtest weird_quoting_tcsh $TS_CMD_GETOPT --shell tcsh -o a: -l long1: -- -a '$?!* ' --long \"\\\' 'More than one -line' >> $TS_OUTPUT 2>&1 +line' >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT gnu_getopt_clean ts_finalize_subtest ts_init_subtest compatible -$TS_CMD_GETOPT >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT -GETOPT_COMPATIBLE='' $TS_CMD_GETOPT >> $TS_OUTPUT 2>&1 +GETOPT_COMPATIBLE='' $TS_CMD_GETOPT >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT sed -i '1,1s/.*\///' $TS_OUTPUT ts_finalize_subtest ts_init_subtest sh -$TS_CMD_GETOPT --shell=sh -o ab:c:: --long a-long,b-long:,c-long:: -n 'example.sh' -- -a -b 1 -c2 --a-long --b-long 3 --c-long foo bar >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT --shell=sh -o ab:c:: --long a-long,b-long:,c-long:: -n 'example.sh' -- -a -b 1 -c2 --a-long --b-long 3 --c-long foo bar >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT ts_finalize_subtest ts_init_subtest csh -$TS_CMD_GETOPT --shell=csh -o ab:c:: --long a-long,b-long:,c-long:: -n 'example.csh' -- -a -b 1 -c2 --a-long --b-long 3 --c-long foo bar >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT --shell=csh -o ab:c:: --long a-long,b-long:,c-long:: -n 'example.csh' -- -a -b 1 -c2 --a-long --b-long 3 --c-long foo bar >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT ts_finalize_subtest ts_init_subtest no-arguments -$TS_CMD_GETOPT >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT sed -i '1,1s/.*\///' $TS_OUTPUT ts_finalize_subtest ts_init_subtest posix_correctly -$TS_CMD_GETOPT -o +ab:c:: --long a-long,b-long:,c-long:: -n 'example' -- -a -b 1 -c2 --a-long --b-long 3 --c-long foo bar xyxxy --a-long >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT -o +ab:c:: --long a-long,b-long:,c-long:: -n 'example' -- -a -b 1 -c2 --a-long --b-long 3 --c-long foo bar xyxxy --a-long >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT -POSIXLY_CORRECT='' $TS_CMD_GETOPT -o ab:c:: --long a-long,b-long:,c-long:: -n 'example' -- -a -b 1 -c2 --a-long --b-long 3 --c-long foo bar xyxxy --a-long >> $TS_OUTPUT 2>&1 +POSIXLY_CORRECT='' $TS_CMD_GETOPT -o ab:c:: --long a-long,b-long:,c-long:: -n 'example' -- -a -b 1 -c2 --a-long --b-long 3 --c-long foo bar xyxxy --a-long >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT ts_finalize_subtest ts_init_subtest non-option -$TS_CMD_GETOPT -o +a:b: -- -a x y -b z w >> $TS_OUTPUT 2>&1 -$TS_CMD_GETOPT -o a:b: -- -a x y -b z w >> $TS_OUTPUT 2>&1 -$TS_CMD_GETOPT -o -a:b: -- -a x y -b z w >> $TS_OUTPUT 2>&1 +$TS_CMD_GETOPT -o +a:b: -- -a x y -b z w >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_GETOPT -o a:b: -- -a x y -b z w >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_GETOPT -o -a:b: -- -a x y -b z w >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit value: $?" >> $TS_OUTPUT ts_finalize_subtest diff --git a/tests/ts/hardlink/options b/tests/ts/hardlink/options index 848ea16544..16d26c4ac1 100755 --- a/tests/ts/hardlink/options +++ b/tests/ts/hardlink/options @@ -40,38 +40,38 @@ show_srcdir() create_srcdir ts_init_subtest "orig" # just list original dir -show_srcdir >>$TS_OUTPUT 2>&1 +show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "dryrun" -$TS_CMD_HARDLINK -n -v "$SRCDIR" >>$TS_OUTPUT 2>&1 -show_srcdir >>$TS_OUTPUT 2>&1 +$TS_CMD_HARDLINK -n -v "$SRCDIR" >> $TS_OUTPUT 2>> $TS_ERRLOG +show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "nargs" -$TS_CMD_HARDLINK -v "$SRCDIR"/dir-1/sdir-1 "$SRCDIR"/file-?-{1,2} >>$TS_OUTPUT 2>&1 -show_srcdir >>$TS_OUTPUT 2>&1 +$TS_CMD_HARDLINK -v "$SRCDIR"/dir-1/sdir-1 "$SRCDIR"/file-?-{1,2} >> $TS_OUTPUT 2>> $TS_ERRLOG +show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest # cases without and with -x support tmp=$($TS_CMD_HARDLINK -x pattern "$SRCDIR"/dir-1/sdir-2 2>&1) if test $? -ne 0; then ts_init_subtest "noregex" - printf "%s\n" "$tmp" >>$TS_OUTPUT 2>&1 + printf "%s\n" "$tmp" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest else ts_init_subtest "regex-escapes" - $TS_CMD_HARDLINK -x '.*z-"§\$%&\(\)=\?\*\+$' "$SRCDIR" >>$TS_OUTPUT 2>&1 - show_srcdir >>$TS_OUTPUT 2>&1 + $TS_CMD_HARDLINK -x '.*z-"§\$%&\(\)=\?\*\+$' "$SRCDIR" >> $TS_OUTPUT 2>> $TS_ERRLOG + show_srcdir >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest fi ts_init_subtest "content" -$TS_CMD_HARDLINK -c "$SRCDIR" >>$TS_OUTPUT 2>&1 +$TS_CMD_HARDLINK -c "$SRCDIR" >> $TS_OUTPUT 2>> $TS_ERRLOG # When using -c we need to cheat with sed because it's not deterministic which # file (i.e. which timestamp and perms) wins. TODO at least the choice of the # permissions should be sensitive by default and/or controllable by the user. -show_srcdir | sed 's/\(1540236\).*/\1xxx\tperm/' >>$TS_OUTPUT 2>&1 +show_srcdir | sed 's/\(1540236\).*/\1xxx\tperm/' >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest rm -rf "$SRCDIR" diff --git a/tests/ts/hexdump/format-strings b/tests/ts/hexdump/format-strings index f2dc6a89bf..3901b36fff 100755 --- a/tests/ts/hexdump/format-strings +++ b/tests/ts/hexdump/format-strings @@ -33,9 +33,9 @@ BE_EXT=$(test "$BYTE_ORDER" = "BE" && echo ".BE") ts_init_subtest "empty-format" TS_EXPECTED+=$BE_EXT INPUT=$(printf \\1) -$TS_CMD_HEXDUMP -n1 -ve '2 "" "%x"' <<< $INPUT >> $TS_OUTPUT 2>&1 +$TS_CMD_HEXDUMP -n1 -ve '2 "" "%x"' <<< $INPUT >> $TS_OUTPUT 2>> $TS_ERRLOG -$TS_CMD_HEXDUMP -n1 -ve '4 "%x"' -e '2 ""' <<< $INPUT >> $TS_OUTPUT 2>&1 +$TS_CMD_HEXDUMP -n1 -ve '4 "%x"' -e '2 ""' <<< $INPUT >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest #basic formats diff --git a/tests/ts/ipcs/mk-rm-msg b/tests/ts/ipcs/mk-rm-msg index de3682e873..a6c96acb68 100755 --- a/tests/ts/ipcs/mk-rm-msg +++ b/tests/ts/ipcs/mk-rm-msg @@ -29,14 +29,14 @@ rm -f $TS_OUTDIR/id-msg $TS_CMD_IPCMK -Q 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-msg $TS_CMD_IPCS -q -i "$(cat $TS_OUTDIR/id-msg)" |\ grep -c "^Message Queue msqid=$(cat $TS_OUTDIR/id-msg)$" >>$TS_OUTPUT -$TS_CMD_IPCRM -q $(cat $TS_OUTDIR/id-msg) >>$TS_OUTPUT 2>&1 +$TS_CMD_IPCRM -q $(cat $TS_OUTDIR/id-msg) >> $TS_OUTPUT 2>> $TS_ERRLOG rm -f $TS_OUTDIR/id-msg $TS_CMD_IPCMK -Q 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-msg $TS_CMD_IPCRM -Q "$( $TS_CMD_IPCS -q | awk -v id=$(cat $TS_OUTDIR/id-msg) '{if ($2 == id){print $1}}' -)" >>$TS_OUTPUT 2>&1 +)" >> $TS_OUTPUT 2>> $TS_ERRLOG rm -f $TS_OUTDIR/id-msg diff --git a/tests/ts/ipcs/mk-rm-sem b/tests/ts/ipcs/mk-rm-sem index d7b505f7ca..8cffe1fc97 100755 --- a/tests/ts/ipcs/mk-rm-sem +++ b/tests/ts/ipcs/mk-rm-sem @@ -28,7 +28,7 @@ ts_check_test_command "$TS_HELPER_SYSINFO" rm -f $TS_OUTDIR/id-sem $TS_CMD_IPCMK -S 1 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-sem $TS_CMD_IPCS -s -i "$(cat $TS_OUTDIR/id-sem)" | grep "^nsems" >>$TS_OUTPUT -$TS_CMD_IPCRM -s $(cat $TS_OUTDIR/id-sem) >>$TS_OUTPUT 2>&1 +$TS_CMD_IPCRM -s $(cat $TS_OUTDIR/id-sem) >> $TS_OUTPUT 2>> $TS_ERRLOG rm -f $TS_OUTDIR/id-sem $TS_CMD_IPCMK -S 2 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-sem @@ -36,7 +36,7 @@ $TS_CMD_IPCS -s -i "$(cat $TS_OUTDIR/id-sem)" | grep "^nsems" >>$TS_OUTPUT $TS_CMD_IPCRM -S "$( $TS_CMD_IPCS -s | awk -v id=$(cat $TS_OUTDIR/id-sem) '{if ($2 == id){print $1}}' -)" >>$TS_OUTPUT 2>&1 +)" >> $TS_OUTPUT 2>> $TS_ERRLOG rm -f $TS_OUTDIR/id-sem diff --git a/tests/ts/ipcs/mk-rm-shm b/tests/ts/ipcs/mk-rm-shm index c21547b824..a3642647fb 100755 --- a/tests/ts/ipcs/mk-rm-shm +++ b/tests/ts/ipcs/mk-rm-shm @@ -28,7 +28,7 @@ ts_check_test_command "$TS_HELPER_SYSINFO" rm -f $TS_OUTDIR/id-shm $TS_CMD_IPCMK -M 1 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-shm $TS_CMD_IPCS -m -i "$(cat $TS_OUTDIR/id-shm)" | sed -n '/^bytes/s/\t.*//p' >>$TS_OUTPUT -$TS_CMD_IPCRM -m $(cat $TS_OUTDIR/id-shm) >>$TS_OUTPUT 2>&1 +$TS_CMD_IPCRM -m $(cat $TS_OUTDIR/id-shm) >> $TS_OUTPUT 2>> $TS_ERRLOG rm -f $TS_OUTDIR/id-shm $TS_CMD_IPCMK -M 12 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-shm @@ -36,7 +36,7 @@ $TS_CMD_IPCS -m -i "$(cat $TS_OUTDIR/id-shm)" | sed -n '/^bytes/s/\t.*//p' >>$TS $TS_CMD_IPCRM -M "$( $TS_CMD_IPCS -m | awk -v id=$(cat $TS_OUTDIR/id-shm) '{if ($2 == id){print $1}}' -)" >>$TS_OUTPUT 2>&1 +)" >> $TS_OUTPUT 2>> $TS_ERRLOG rm -f $TS_OUTDIR/id-shm diff --git a/tests/ts/isosize/print-size b/tests/ts/isosize/print-size index 277c124831..dcd585bc5a 100755 --- a/tests/ts/isosize/print-size +++ b/tests/ts/isosize/print-size @@ -23,15 +23,15 @@ ts_check_test_command "$TS_CMD_ISOSIZE" gzip -cd $TS_SELF/sample.iso.gz >| $TS_OUTDIR/sample.iso ts_init_subtest "default_output" -$TS_CMD_ISOSIZE $TS_OUTDIR/sample.iso >| $TS_OUTPUT 2>&1 +$TS_CMD_ISOSIZE $TS_OUTDIR/sample.iso >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "sector_output" -$TS_CMD_ISOSIZE --sectors $TS_OUTDIR/sample.iso &> $TS_OUTPUT 2>&1 +$TS_CMD_ISOSIZE --sectors $TS_OUTDIR/sample.iso >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "divisor_output" -$TS_CMD_ISOSIZE --divisor=9 $TS_OUTDIR/sample.iso &> $TS_OUTPUT 2>&1 +$TS_CMD_ISOSIZE --divisor=9 $TS_OUTDIR/sample.iso >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_finalize diff --git a/tests/ts/kill/all_processes b/tests/ts/kill/all_processes index 7a0c959319..0b137574d7 100755 --- a/tests/ts/kill/all_processes +++ b/tests/ts/kill/all_processes @@ -33,32 +33,33 @@ ts_check_test_command "$TS_HELPER_SIGRECEIVE" HELPER_SYMLINK="$(mktemp "${TS_OUTDIR}/alXXXXXXXXXXXXX")" ln -sf "$TS_HELPER_SIGRECEIVE" "$HELPER_SYMLINK" -"$HELPER_SYMLINK" -s "$TS_TESTUSER" >> "$TS_OUTPUT" 2>&1 & +"$HELPER_SYMLINK" -s "$TS_TESTUSER" >> $TS_OUTPUT 2>> $TS_ERRLOG & TEST_PID=$! check_test_sigreceive $TEST_PID [ $? -eq 1 ] || echo "${HELPER_SYMLINK##*/} helper did not start" >> "$TS_OUTPUT" -echo "test 1" >> "$TS_OUTPUT" -"$TS_CMD_KILL" ${HELPER_SYMLINK##*/} >> "$TS_OUTPUT" 2>&1 + +ts_log_both "test 1" +"$TS_CMD_KILL" ${HELPER_SYMLINK##*/} >> $TS_OUTPUT 2>> $TS_ERRLOG if [ $? -ne 1 ]; then echo "kill did not return 1" >> "$TS_OUTPUT" fi -echo "test 2" >> "$TS_OUTPUT" -"$TS_CMD_KILL" -a ${HELPER_SYMLINK##*/} >> "$TS_OUTPUT" 2>&1 +ts_log_both "test 2" +"$TS_CMD_KILL" -a ${HELPER_SYMLINK##*/} >> $TS_OUTPUT 2>> $TS_ERRLOG if [ $? -ne 0 ]; then echo "kill did not return 0" >> "$TS_OUTPUT" fi wait $TEST_PID -echo "test 3" >> "$TS_OUTPUT" -"$TS_CMD_KILL" -a -p ${HELPER_SYMLINK##*/} >> "$TS_OUTPUT" 2>&1 +ts_log_both "test 3" +"$TS_CMD_KILL" -a -p ${HELPER_SYMLINK##*/} >> $TS_OUTPUT 2>> $TS_ERRLOG if [ $? -ne 1 ]; then echo "kill -a -p did not return 1" >> "$TS_OUTPUT" fi -sed -i "s/${HELPER_SYMLINK##*/}/${TS_HELPER_SIGRECEIVE##*/}/" "$TS_OUTPUT" +sed -i "s/${HELPER_SYMLINK##*/}/${TS_HELPER_SIGRECEIVE##*/}/" $TS_OUTPUT $TS_ERRLOG rm -f "$HELPER_SYMLINK" diff --git a/tests/ts/kill/name_to_number b/tests/ts/kill/name_to_number index b6ae4be4d8..9f4881cb71 100755 --- a/tests/ts/kill/name_to_number +++ b/tests/ts/kill/name_to_number @@ -51,12 +51,12 @@ for SIG in $($TS_CMD_KILL -L); do SIG="$SIG-0" fi - "$HELPER_SYMLINK" >> "$TS_OUTPUT" 2>&1 & + "$HELPER_SYMLINK" >> $TS_OUTPUT 2>> $TS_ERRLOG & TEST_PID=$! check_test_sigreceive $TEST_PID [ $? -eq 1 ] || echo "${HELPER_SYMLINK##*/} helper did not start" >> "$TS_OUTPUT" - "$TS_CMD_KILL" -$SIG ${HELPER_SYMLINK##*/} >> "$TS_OUTPUT" 2>&1 + "$TS_CMD_KILL" -$SIG ${HELPER_SYMLINK##*/} >> $TS_OUTPUT 2>> $TS_ERRLOG wait $TEST_PID if [ $? -ne $EXPECTED ]; then echo "$SIG returned $? while $EXPECTED was expected" >> "$TS_OUTPUT" diff --git a/tests/ts/kill/options b/tests/ts/kill/options index ee9e52f47f..2788c70a27 100755 --- a/tests/ts/kill/options +++ b/tests/ts/kill/options @@ -35,12 +35,12 @@ ln -sf "$TS_HELPER_SIGRECEIVE" "$HELPER_SYMLINK" try_option() { - "$HELPER_SYMLINK" >> "$TS_OUTPUT" 2>&1 & + "$HELPER_SYMLINK" >> $TS_OUTPUT 2>> $TS_ERRLOG & TEST_PID=$! check_test_sigreceive $TEST_PID [ $? -eq 1 ] || echo "${HELPER_SYMLINK##*/} helper did not start" >> "$TS_OUTPUT" - "$TS_CMD_KILL" "$@" $TEST_PID >> "$TS_OUTPUT" 2>&1 + "$TS_CMD_KILL" "$@" $TEST_PID >> $TS_OUTPUT 2>> $TS_ERRLOG if [ $? -ne 0 ]; then echo "kill $@ did not work" >> "$TS_OUTPUT" all_ok=false diff --git a/tests/ts/kill/print_pid b/tests/ts/kill/print_pid index 2a2a838ee8..6926a3714b 100755 --- a/tests/ts/kill/print_pid +++ b/tests/ts/kill/print_pid @@ -33,12 +33,12 @@ all_ok=true HELPER_SYMLINK="$(mktemp "${TS_OUTDIR}/prXXXXXXXXXXXXX")" ln -sf "$TS_HELPER_SIGRECEIVE" "$HELPER_SYMLINK" -"$HELPER_SYMLINK" >> "$TS_OUTPUT" 2>&1 & +"$HELPER_SYMLINK" >> $TS_OUTPUT 2>> $TS_ERRLOG & TEST_PID=$! check_test_sigreceive $TEST_PID [ $? -eq 1 ] || echo "${HELPER_SYMLINK##*/} helper did not start" >> "$TS_OUTPUT" -KILL_PID=$("$TS_CMD_KILL" -p ${HELPER_SYMLINK##*/} 2>> "$TS_OUTPUT" 2>&1) +KILL_PID=$("$TS_CMD_KILL" -p ${HELPER_SYMLINK##*/} 2>> $TS_OUTPUT 2>> $TS_ERRLOG) if [ $? -ne 0 ]; then echo "kill -p did not work" >> "$TS_OUTPUT" all_ok=false diff --git a/tests/ts/kill/queue b/tests/ts/kill/queue index 4727cbfc4f..18f10e8c29 100755 --- a/tests/ts/kill/queue +++ b/tests/ts/kill/queue @@ -33,12 +33,12 @@ all_ok=true HELPER_SYMLINK="$(mktemp "${TS_OUTDIR}/quXXXXXXXXXXXXX")" ln -sf "$TS_HELPER_SIGRECEIVE" "$HELPER_SYMLINK" -"$HELPER_SYMLINK" >> "$TS_OUTPUT" 2>&1 & +"$HELPER_SYMLINK" >> $TS_OUTPUT 2>> $TS_ERRLOG & TEST_PID=$! check_test_sigreceive $TEST_PID [ $? -eq 1 ] || echo "${HELPER_SYMLINK##*/} helper did not start" >> "$TS_OUTPUT" -"$TS_CMD_KILL" -1 --queue 42 $TEST_PID >> "$TS_OUTPUT" 2>&1 +"$TS_CMD_KILL" -1 --queue 42 $TEST_PID >> $TS_OUTPUT 2>> $TS_ERRLOG if [ $? -ne 0 ]; then echo "kill --queue 42 failed" >> "$TS_OUTPUT" all_ok=false diff --git a/tests/ts/libfdisk/gpt b/tests/ts/libfdisk/gpt index b6257e70d2..3578cd1b86 100755 --- a/tests/ts/libfdisk/gpt +++ b/tests/ts/libfdisk/gpt @@ -27,7 +27,7 @@ ts_check_test_command "$TS_CMD_SFDISK" TEST_IMAGE_NAME=$(ts_image_init 10) ts_init_subtest "all-defaults" -$TS_CMD_SFDISK --unit S ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>&1 -ts_run $TESTPROG --getattr ${TEST_IMAGE_NAME} 2 >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --getattr ${TEST_IMAGE_NAME} 1 >> $TS_OUTPUT 2>> $TS_ERRLOG +ts_run $TESTPROG --getattr ${TEST_IMAGE_NAME} 2 >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "setattr" -ts_run $TESTPROG --setattr ${TEST_IMAGE_NAME} 1 0xff00000000000000 >> $TS_OUTPUT 2>&1 -ts_run $TESTPROG --setattr ${TEST_IMAGE_NAME} 2 0x4 >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --part-attrs ${TEST_IMAGE_NAME} 1 >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --part-attrs ${TEST_IMAGE_NAME} 2 >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --setattr ${TEST_IMAGE_NAME} 1 0xff00000000000000 >> $TS_OUTPUT 2>> $TS_ERRLOG +ts_run $TESTPROG --setattr ${TEST_IMAGE_NAME} 2 0x4 >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --part-attrs ${TEST_IMAGE_NAME} 1 >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --part-attrs ${TEST_IMAGE_NAME} 2 >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_finalize diff --git a/tests/ts/libfdisk/mkpart b/tests/ts/libfdisk/mkpart index 7365881c2f..44029a69fd 100755 --- a/tests/ts/libfdisk/mkpart +++ b/tests/ts/libfdisk/mkpart @@ -30,8 +30,8 @@ TEST_IMAGE_NAME=$(ts_image_init 15) ts_init_subtest "mbr" $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \ - 1M 1M 1M - >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 + 1M 1M 1M - >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize_subtest @@ -39,8 +39,8 @@ $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null ts_init_subtest "mbr-logic" $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \ - 1M 1M 1M - 1M 1M ->> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 + 1M 1M 1M - 1M 1M ->> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize_subtest @@ -48,8 +48,8 @@ $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null ts_init_subtest "mbr-nopartno" $TESTPROG --nopartno --label mbr --device ${TEST_IMAGE_NAME} \ - 1M 1M 1M - 1M 1M ->> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 + 1M 1M 1M - 1M 1M ->> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize_subtest @@ -57,8 +57,8 @@ $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null ts_init_subtest "gpt" $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \ - 1M 1M 1M 1M 1M 1M - >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 + 1M 1M 1M 1M 1M 1M - >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize_subtest diff --git a/tests/ts/libfdisk/mkpart-full b/tests/ts/libfdisk/mkpart-full index 9fb46ef670..b08891d9f1 100755 --- a/tests/ts/libfdisk/mkpart-full +++ b/tests/ts/libfdisk/mkpart-full @@ -36,8 +36,8 @@ ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \ 2,4096,2048 \ 3,6144,2048 \ 4,8192,22528 \ - >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize_subtest @@ -50,8 +50,8 @@ ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} -- \ -,4096,2048 \ -,6144,2048 \ -,8192,22528 \ - >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize_subtest @@ -63,8 +63,8 @@ ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \ 1,2048,2048 \ 2,4096,2048 \ 7,6144,2048 \ - >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize_subtest @@ -76,8 +76,8 @@ ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \ 1,2048,2048 \ 2,4096,2048 \ 3,4096,2048 \ - >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize_subtest @@ -93,8 +93,8 @@ ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \ 5,10240,2048 \ 6,14336,2048 \ 7,18432,12288 \ - >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize_subtest @@ -109,8 +109,8 @@ ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} -- \ -,10240,2048 \ -,14336,2048 \ -,18432,12288 \ - >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize_subtest @@ -126,8 +126,8 @@ ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \ 5,10240,2048 \ 6,4096,2048 \ 7,18432,12288 \ - >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize_subtest @@ -138,8 +138,8 @@ ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \ 1,2048,2048 \ 2,6144,2048 \ 3,8192,2048 \ - >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize_subtest @@ -154,8 +154,8 @@ ts_run --unbuffered $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \ 5,10240,2048 \ 6,12288,2048 \ 7,14336,2048 \ - >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize_subtest @@ -170,8 +170,8 @@ ts_run --unbuffered $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} -- \ -,10240,2048 \ -,12288,2048 \ -,14336,2048 \ - >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize_subtest @@ -187,8 +187,8 @@ ts_run --unbuffered $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \ 5,10240,2048 \ 6,12288,2048 \ 7,14336,2048 \ - >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize_subtest @@ -203,8 +203,8 @@ ts_run --unbuffered $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \ 7,10240,2048 \ 8,12288,2048 \ 9,14336,2048 \ - >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize_subtest @@ -217,8 +217,8 @@ ts_run --unbuffered $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \ 3,8192,2048 \ 4,12288,2048 \ 5,14336,2048 \ - >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --list ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean ${TEST_IMAGE_NAME} ts_finalize_subtest diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context index 6dd35b193b..f39d375030 100755 --- a/tests/ts/libmount/context +++ b/tests/ts/libmount/context @@ -83,52 +83,52 @@ ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" ts_init_subtest "mount-by-devname" mkdir -p $MOUNTPOINT &> /dev/null -ts_run $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 -is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "umount-by-devname" -ts_run $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>&1 -is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "mount-by-label" mkdir -p $MOUNTPOINT &> /dev/null -ts_run $TESTPROG --mount LABEL="$LABEL" $MOUNTPOINT >> $TS_OUTPUT 2>&1 -is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --mount LABEL="$LABEL" $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "umount-by-mountpoint" -ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 -is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "mount-by-uuid" mkdir -p $MOUNTPOINT &> /dev/null -ts_run $TESTPROG --mount UUID="$UUID" $MOUNTPOINT >> $TS_OUTPUT 2>&1 -is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --mount UUID="$UUID" $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG sleep 1 -ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG sleep 1 -is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>&1 +is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "mount-flags" mkdir -p $MOUNTPOINT &> /dev/null -ts_run $TESTPROG --mount -o ro,noexec,nosuid,strictatime $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 -$TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>&1 -is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --mount -o ro,noexec,nosuid,strictatime $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG -ts_run $TESTPROG --mount -o remount,rw $MOUNTPOINT >> $TS_OUTPUT 2>&1 -$TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --mount -o remount,rw $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>> $TS_ERRLOG -ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 -is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest @@ -138,11 +138,11 @@ img=$(ts_image_init) mkfs.ext3 -F $img &> /dev/null udevadm settle -ts_run $TESTPROG --mount -o loop $img $MOUNTPOINT >> $TS_OUTPUT 2>&1 -is_mounted $MOUNTPOINT || echo "$MOUNTPOINT not mounted" >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --mount -o loop $img $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $MOUNTPOINT || echo "$MOUNTPOINT not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle -ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 -is_mounted $MOUNTPOINT && echo "$MOUNTPOINT still mounted" >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $MOUNTPOINT && echo "$MOUNTPOINT still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest @@ -151,7 +151,7 @@ ts_init_subtest "x-permanent" TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex" [ -d $TS_NOEXIST ] && rmdir $TS_NOEXIST -$TS_CMD_MOUNT -o x-mount.mkdir --bind $MOUNTPOINT $TS_NOEXIST >> $TS_OUTPUT 2>&1 && +$TS_CMD_MOUNT -o x-mount.mkdir --bind $MOUNTPOINT $TS_NOEXIST >> $TS_OUTPUT 2>> $TS_ERRLOG && echo "successfully mounted" >> $TS_OUTPUT ts_finalize_subtest @@ -164,7 +164,7 @@ ts_init_subtest "X-comment" TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex" [ -d $TS_NOEXIST ] && rmdir $TS_NOEXIST -$TS_CMD_MOUNT -o X-mount.mkdir --bind $MOUNTPOINT $TS_NOEXIST >> $TS_OUTPUT 2>&1 && +$TS_CMD_MOUNT -o X-mount.mkdir --bind $MOUNTPOINT $TS_NOEXIST >> $TS_OUTPUT 2>> $TS_ERRLOG && echo "successfully mounted" >> $TS_OUTPUT ts_finalize_subtest diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py index f86edd3af5..780c2f205b 100755 --- a/tests/ts/libmount/context-py +++ b/tests/ts/libmount/context-py @@ -92,50 +92,50 @@ ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" ts_init_subtest "mount-by-devname" mkdir -p $MOUNTPOINT &> /dev/null -$PYTHON $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 -is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>&1 +$PYTHON $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "umount-by-devname" -$PYTHON $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>&1 -is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>&1 +$PYTHON $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "mount-by-label" mkdir -p $MOUNTPOINT &> /dev/null -$PYTHON $TESTPROG --mount LABEL="$LABEL" $MOUNTPOINT >> $TS_OUTPUT 2>&1 -is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>&1 +$PYTHON $TESTPROG --mount LABEL="$LABEL" $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "umount-by-mountpoint" -$PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 -is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>&1 +$PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "mount-by-uuid" mkdir -p $MOUNTPOINT &> /dev/null -$PYTHON $TESTPROG --mount UUID="$UUID" $MOUNTPOINT >> $TS_OUTPUT 2>&1 -is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>&1 -$PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 -is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>&1 +$PYTHON $TESTPROG --mount UUID="$UUID" $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG +$PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "mount-flags" mkdir -p $MOUNTPOINT &> /dev/null -$PYTHON $TESTPROG --mount -o ro,noexec,nosuid,strictatime $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 -$TS_CMD_FINDMNT --kernel $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>&1 -is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>&1 +$PYTHON $TESTPROG --mount -o ro,noexec,nosuid,strictatime $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_FINDMNT --kernel $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG -$PYTHON $TESTPROG --mount -o remount,rw $MOUNTPOINT >> $TS_OUTPUT 2>&1 -$TS_CMD_FINDMNT --kernel $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>&1 +$PYTHON $TESTPROG --mount -o remount,rw $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_FINDMNT --kernel $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>> $TS_ERRLOG -$PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 -is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>&1 +$PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest @@ -145,15 +145,15 @@ img=$(ts_image_init) mkfs.ext3 -F $img &> /dev/null udevadm settle -$PYTHON $TESTPROG --mount -o loop $img $MOUNTPOINT >> $TS_OUTPUT 2>&1 -is_mounted $MOUNTPOINT || echo "$MOUNTPOINT not mounted" >> $TS_OUTPUT 2>&1 +$PYTHON $TESTPROG --mount -o loop $img $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $MOUNTPOINT || echo "$MOUNTPOINT not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle -$PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 -is_mounted $MOUNTPOINT && echo "$MOUNTPOINT still mounted" >> $TS_OUTPUT 2>&1 +$PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG +is_mounted $MOUNTPOINT && echo "$MOUNTPOINT still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "x-mount.mkdir" -$TS_CMD_MOUNT -o x-mount.mkdir --bind $MOUNTPOINT $TS_NOEXIST >> $TS_OUTPUT 2>&1 && +$TS_CMD_MOUNT -o x-mount.mkdir --bind $MOUNTPOINT $TS_NOEXIST >> $TS_OUTPUT 2>> $TS_ERRLOG && echo "successfully mounted" >> $TS_OUTPUT ts_finalize_subtest diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab index a63ba57d61..3fb38f6299 100755 --- a/tests/ts/libmount/context-utab +++ b/tests/ts/libmount/context-utab @@ -66,31 +66,31 @@ udevadm settle ts_init_subtest "mount-by-devname" mkdir -p $MOUNTPOINT &> /dev/null -ts_run $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted "$DEVICE" || \ - echo "(by device) cannot find $DEVICE in /proc/mounts" >> $TS_OUTPUT 2>&1 + echo "(by device) cannot find $DEVICE in /proc/mounts" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "umount-by-devname" -ts_run $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted "$DEVICE" && - echo "umount (device) failed: found $DEVICE in /proc/mounts" >> $TS_OUTPUT 2>&1 + echo "umount (device) failed: found $DEVICE in /proc/mounts" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "mount-uhelper" mkdir -p $MOUNTPOINT &> /dev/null -ts_run $TESTPROG --mount -o uhelper=foo,rw LABEL="$LABEL" $MOUNTPOINT >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --mount -o uhelper=foo,rw LABEL="$LABEL" $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG grep -q "SRC=$DEVICE\b" "$LIBMOUNT_UTAB" || \ - echo "(by label) cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 + echo "(by label) cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "umount" -ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG grep -q "SRC=$DEVICE\b" "$LIBMOUNT_UTAB" && \ - echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 + echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest @@ -108,9 +108,9 @@ if type "mkfs.btrfs" &>/dev/null && mkfs.btrfs --version &>/dev/null; then ts_init_subtest "mount-uhelper-subvol" mkdir -p $MOUNTPOINT &> /dev/null - ts_run $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 + ts_run $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG grep -q "SRC=$DEVICE\b" "$LIBMOUNT_UTAB" || \ - echo "cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 + echo "cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest # Don't temporary write btrfs mount options to the test output, @@ -118,13 +118,13 @@ if type "mkfs.btrfs" &>/dev/null && mkfs.btrfs --version &>/dev/null; then # subvol= and subvolid=). # #ts_log "All mount options (btrfs subvolume + utab) ---" - #$TS_CMD_FINDMNT --mtab --mountpoint $MOUNTPOINT -o OPTIONS -n >> $TS_OUTPUT 2>&1 + #$TS_CMD_FINDMNT --mtab --mountpoint $MOUNTPOINT -o OPTIONS -n >> $TS_OUTPUT 2>> $TS_ERRLOG #ts_log "---" ts_init_subtest "umount-subvol" - ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 + ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG grep -q "SRC=$DEVICE\b" "$LIBMOUNT_UTAB" && \ - echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 + echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest fi diff --git a/tests/ts/libmount/context-utab-py b/tests/ts/libmount/context-utab-py index 3a1da05c14..a2e821fe6c 100755 --- a/tests/ts/libmount/context-utab-py +++ b/tests/ts/libmount/context-utab-py @@ -71,31 +71,31 @@ udevadm settle ts_init_subtest "mount-by-devname" mkdir -p $MOUNTPOINT &> /dev/null -$PYTHON $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 +$PYTHON $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted "$DEVICE" || \ - echo "(by device) cannot find $DEVICE in /proc/mounts" >> $TS_OUTPUT 2>&1 + echo "(by device) cannot find $DEVICE in /proc/mounts" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "umount-by-devname" -$PYTHON $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>&1 +$PYTHON $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted "$DEVICE" && - echo "umount (device) failed: found $DEVICE in /proc/mounts" >> $TS_OUTPUT 2>&1 + echo "umount (device) failed: found $DEVICE in /proc/mounts" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "mount-uhelper" mkdir -p $MOUNTPOINT &> /dev/null -$PYTHON $TESTPROG --mount -o uhelper=foo,rw LABEL="$LABEL" $MOUNTPOINT >> $TS_OUTPUT 2>&1 +$PYTHON $TESTPROG --mount -o uhelper=foo,rw LABEL="$LABEL" $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG grep -q "SRC=$DEVICE\b" "$LIBMOUNT_UTAB" || \ - echo "(by label) cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 + echo "(by label) cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "umount" -$PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 +$PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG grep -q "SRC=$DEVICE\b" "$LIBMOUNT_UTAB" && \ - echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 + echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest @@ -113,9 +113,9 @@ if type "mkfs.btrfs" &>/dev/null && mkfs.btrfs --version &>/dev/null; then ts_init_subtest "mount-uhelper-subvol" mkdir -p $MOUNTPOINT &> /dev/null - $PYTHON $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 + $PYTHON $TESTPROG --mount -o uhelper=foo,rw,subvol=sub $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG grep -q "SRC=$DEVICE\b" "$LIBMOUNT_UTAB" || \ - echo "cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 + echo "cannot find $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest # Don't temporary write btrfs mount options to the test output, @@ -123,13 +123,13 @@ if type "mkfs.btrfs" &>/dev/null && mkfs.btrfs --version &>/dev/null; then # subvol= and subvolid=). # #ts_log "All mount options (btrfs subvolume + utab) ---" - #$TS_CMD_FINDMNT --mtab $MOUNTPOINT -o OPTIONS -n >> $TS_OUTPUT 2>&1 + #$TS_CMD_FINDMNT --mtab $MOUNTPOINT -o OPTIONS -n >> $TS_OUTPUT 2>> $TS_ERRLOG #ts_log "---" ts_init_subtest "umount-subvol" - $PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 + $PYTHON $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG grep -q $DEVICE $LIBMOUNT_UTAB && \ - echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>&1 + echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_UTAB" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest fi diff --git a/tests/ts/libmount/loop b/tests/ts/libmount/loop index 090b79fa4a..9d1d17e859 100755 --- a/tests/ts/libmount/loop +++ b/tests/ts/libmount/loop @@ -56,16 +56,16 @@ udevadm settle ts_init_subtest "file" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT -$TS_CMD_MOUNT "$BACKFILE" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>&1 -$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT "$BACKFILE" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_log "Success" ts_finalize_subtest ts_init_subtest "file-o-loop" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT -$TS_CMD_MOUNT -oloop "$BACKFILE" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>&1 -$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -oloop "$BACKFILE" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_log "Success" ts_finalize_subtest @@ -73,10 +73,10 @@ ts_finalize_subtest ts_init_subtest "dev-loop" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT LODEV=$( $TS_CMD_LOSETUP --find --nooverlap --show $BACKFILE 2>> $TS_OUTPUT ) -$TS_CMD_MOUNT $LODEV "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>&1 -verify_mount_dev "$LODEV" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>&1 -$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>&1 -$TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT $LODEV "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG +verify_mount_dev "$LODEV" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_log "Success" ts_finalize_subtest @@ -88,9 +88,9 @@ if [ "$TS_PARALLEL" = "yes" ]; then else [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT LODEV=$( $TS_CMD_LOSETUP --find 2>> $TS_OUTPUT ) - $TS_CMD_MOUNT -oloop=$LODEV "$BACKFILE" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>&1 - verify_mount_dev "$LODEV" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>&1 - $TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>&1 + $TS_CMD_MOUNT -oloop=$LODEV "$BACKFILE" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG + verify_mount_dev "$LODEV" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG + $TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_log "Success" ts_finalize_subtest @@ -99,10 +99,10 @@ fi ts_init_subtest "reuse" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT LODEV=$( $TS_CMD_LOSETUP --find --nooverlap --show "$BACKFILE" 2>> $TS_OUTPUT ) -$TS_CMD_MOUNT "$BACKFILE" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>&1 -verify_mount_dev "$LODEV" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>&1 -$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>&1 -$TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT "$BACKFILE" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG +verify_mount_dev "$LODEV" "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_log "Success" ts_finalize_subtest @@ -112,7 +112,7 @@ ts_init_subtest "conflict" LODEV=$( $TS_CMD_LOSETUP --find --nooverlap --show --offset=1000 "$BACKFILE" 2>> $TS_OUTPUT ) $TS_CMD_MOUNT "$BACKFILE" "$TS_MOUNTPOINT" 2>&1 \ | sed 's/:.*:/: /; s/for .*/for /' > $TS_OUTPUT -$TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>&1 +$TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_log "Success" ts_finalize_subtest @@ -122,7 +122,7 @@ ts_init_subtest "o-loop-val-initialized" LODEV=$( $TS_CMD_LOSETUP --show -f "$BACKFILE" 2>>$TS_OUTPUT) $TS_CMD_MOUNT -oloop=$LODEV "$BACKFILE" "$TS_MOUNTPOINT" 2>&1 \ | sed 's/:.*:/: /; s/for .*/for /' > $TS_OUTPUT -$TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>&1 +$TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_log "Success" ts_finalize_subtest @@ -133,7 +133,7 @@ cp "$BACKFILE" "$BACKFILE"-2 LODEV=$( $TS_CMD_LOSETUP --show -f "$BACKFILE"-2 2>> $TS_OUTPUT) $TS_CMD_MOUNT -oloop=$LODEV "$BACKFILE" "$TS_MOUNTPOINT" 2>&1 \ | sed 's/:.*:/: /; s/for .*/for /' > $TS_OUTPUT -$TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>&1 +$TS_CMD_LOSETUP --detach $LODEV >> $TS_OUTPUT 2>> $TS_ERRLOG rm "$BACKFILE"-2 udevadm settle ts_log "Success" diff --git a/tests/ts/libmount/loop-overlay b/tests/ts/libmount/loop-overlay index fffb823c09..39ccd904f1 100755 --- a/tests/ts/libmount/loop-overlay +++ b/tests/ts/libmount/loop-overlay @@ -42,16 +42,16 @@ dd if="$IMG" of="$IMG" oflag=append bs=1024k count=5 conv=notrunc &>/dev/null [ -d "$TS_MOUNTPOINT-2" ] || mkdir -p $TS_MOUNTPOINT-2 echo "second should fail" >>$TS_OUTPUT -$TS_CMD_MOUNT -oloop "$IMG" "$TS_MOUNTPOINT-1" >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -oloop "$IMG" "$TS_MOUNTPOINT-1" >> $TS_OUTPUT 2>> $TS_ERRLOG $TS_CMD_MOUNT -oloop,offset=$OFFSET "$IMG" "$TS_MOUNTPOINT-2" 2>&1 \ | sed 's/:.*:/: /; s/for .*/for /' >> $TS_OUTPUT -$TS_CMD_UMOUNT "$TS_MOUNTPOINT-1" >> $TS_OUTPUT 2>&1 +$TS_CMD_UMOUNT "$TS_MOUNTPOINT-1" >> $TS_OUTPUT 2>> $TS_ERRLOG echo "should succeed" >>$TS_OUTPUT -$TS_CMD_MOUNT -oloop,sizelimit=$OFFSET "$IMG" "$TS_MOUNTPOINT-1" >> $TS_OUTPUT 2>&1 -$TS_CMD_MOUNT -oloop,offset=$OFFSET "$IMG" "$TS_MOUNTPOINT-2" >> $TS_OUTPUT 2>&1 -$TS_CMD_UMOUNT "$TS_MOUNTPOINT-1" >> $TS_OUTPUT 2>&1 -$TS_CMD_UMOUNT "$TS_MOUNTPOINT-2" >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -oloop,sizelimit=$OFFSET "$IMG" "$TS_MOUNTPOINT-1" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_MOUNT -oloop,offset=$OFFSET "$IMG" "$TS_MOUNTPOINT-2" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_UMOUNT "$TS_MOUNTPOINT-1" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_UMOUNT "$TS_MOUNTPOINT-2" >> $TS_OUTPUT 2>> $TS_ERRLOG echo "both should fail" >>$TS_OUTPUT LOOPDEV=$($TS_CMD_LOSETUP --show -f --offset 1 --sizelimit $OFFSET "$IMG") diff --git a/tests/ts/libmount/utils b/tests/ts/libmount/utils index bc89d4600b..ad25e8f81f 100755 --- a/tests/ts/libmount/utils +++ b/tests/ts/libmount/utils @@ -74,11 +74,11 @@ ts_finalize_subtest ts_init_subtest "kernel-cmdline" export LIBMOUNT_KERNEL_CMDLINE="$TS_SELF/files/kernel_cmdline" -ts_run $TESTPROG --kernel-cmdline selinux= >> $TS_OUTPUT 2>&1 -ts_run $TESTPROG --kernel-cmdline selinux >> $TS_OUTPUT 2>&1 -ts_run $TESTPROG --kernel-cmdline ro >> $TS_OUTPUT 2>&1 -ts_run $TESTPROG --kernel-cmdline ro= >> $TS_OUTPUT 2>&1 -ts_run $TESTPROG --kernel-cmdline root= >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --kernel-cmdline selinux= >> $TS_OUTPUT 2>> $TS_ERRLOG +ts_run $TESTPROG --kernel-cmdline selinux >> $TS_OUTPUT 2>> $TS_ERRLOG +ts_run $TESTPROG --kernel-cmdline ro >> $TS_OUTPUT 2>> $TS_ERRLOG +ts_run $TESTPROG --kernel-cmdline ro= >> $TS_OUTPUT 2>> $TS_ERRLOG +ts_run $TESTPROG --kernel-cmdline root= >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_finalize diff --git a/tests/ts/libsmartcols/fromfile b/tests/ts/libsmartcols/fromfile index 20994d6619..d87f2cc7de 100755 --- a/tests/ts/libsmartcols/fromfile +++ b/tests/ts/libsmartcols/fromfile @@ -35,7 +35,7 @@ ts_run $TESTPROG --nlines 10 \ $TS_SELF/files/data-id \ $TS_SELF/files/data-parent \ $TS_SELF/files/data-string-long \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "tree-json" @@ -50,7 +50,7 @@ ts_run $TESTPROG --nlines 10 --json \ $TS_SELF/files/data-id \ $TS_SELF/files/data-parent \ $TS_SELF/files/data-string-long \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "tree-middle" @@ -65,7 +65,7 @@ ts_run $TESTPROG --nlines 10 \ $TS_SELF/files/data-parent \ $TS_SELF/files/data-string \ $TS_SELF/files/data-string-long \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "tree-end" @@ -80,7 +80,7 @@ ts_run $TESTPROG --nlines 10 \ $TS_SELF/files/data-parent \ $TS_SELF/files/data-string-long \ $TS_SELF/files/data-string \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "trunc" @@ -91,7 +91,7 @@ ts_run $TESTPROG --nlines 10 --width 40 \ $TS_SELF/files/data-string \ $TS_SELF/files/data-number \ $TS_SELF/files/data-string-long \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "right" @@ -102,7 +102,7 @@ ts_run $TESTPROG --nlines 10 \ $TS_SELF/files/data-string \ $TS_SELF/files/data-number \ $TS_SELF/files/data-string-long \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "right-maxout" @@ -111,7 +111,7 @@ ts_run $TESTPROG --nlines 10 --maxout --width 80\ --column $TS_SELF/files/col-number \ $TS_SELF/files/data-string \ $TS_SELF/files/data-number \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "padding-default" @@ -168,7 +168,7 @@ ts_run $TESTPROG --nlines 10 \ $TS_SELF/files/data-string \ $TS_SELF/files/data-number-tiny \ $TS_SELF/files/data-number \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "noextremes" @@ -183,7 +183,7 @@ ts_run $TESTPROG --nlines 10 --width 45 \ $TS_SELF/files/data-number \ $TS_SELF/files/data-string \ $TS_SELF/files/data-number \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "hidden" @@ -194,7 +194,7 @@ ts_run $TESTPROG --nlines 10 \ $TS_SELF/files/data-string \ $TS_SELF/files/data-string-long \ $TS_SELF/files/data-number \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "wrap" @@ -205,7 +205,7 @@ ts_run $TESTPROG --nlines 10 --width 40 \ $TS_SELF/files/data-string \ $TS_SELF/files/data-number \ $TS_SELF/files/data-string-long \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "wrap-tree" @@ -220,7 +220,7 @@ ts_run $TESTPROG --nlines 10 --width 45 \ $TS_SELF/files/data-id \ $TS_SELF/files/data-parent \ $TS_SELF/files/data-string-long \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "wrapnl" @@ -231,7 +231,7 @@ ts_run $TESTPROG --nlines 10 \ $TS_SELF/files/data-string \ $TS_SELF/files/data-number \ $TS_SELF/files/data-string-nl \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "wrapnl-tree" @@ -246,7 +246,7 @@ ts_run $TESTPROG --nlines 10 \ $TS_SELF/files/data-id \ $TS_SELF/files/data-parent \ $TS_SELF/files/data-string-nl \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "raw" @@ -257,7 +257,7 @@ ts_run $TESTPROG --nlines 10 --raw \ $TS_SELF/files/data-string \ $TS_SELF/files/data-number \ $TS_SELF/files/data-string-long \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "export" @@ -268,7 +268,7 @@ ts_run $TESTPROG --nlines 10 --export \ $TS_SELF/files/data-string \ $TS_SELF/files/data-number \ $TS_SELF/files/data-string-long \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "column-separator" @@ -279,7 +279,7 @@ ts_run $TESTPROG --nlines 10 --colsep \| \ $TS_SELF/files/data-string \ $TS_SELF/files/data-number \ $TS_SELF/files/data-string-long \ - >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_log "...done." diff --git a/tests/ts/libsmartcols/title b/tests/ts/libsmartcols/title index 576aa2d476..77c2797002 100755 --- a/tests/ts/libsmartcols/title +++ b/tests/ts/libsmartcols/title @@ -23,6 +23,6 @@ ts_init "$*" TESTPROG="$TS_HELPER_LIBSMARTCOLS_TITLE" ts_check_test_command "$TESTPROG" -ts_run $TESTPROG --width 80 >> $TS_OUTPUT 2>&1 +ts_run $TESTPROG --width 80 >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize diff --git a/tests/ts/logger/errors b/tests/ts/logger/errors index 33c10578d2..12f2f199e1 100755 --- a/tests/ts/logger/errors +++ b/tests/ts/logger/errors @@ -39,7 +39,7 @@ SOCAT_PID="$!" function logger_fun { # logger without --no-act to write all data to the socket echo "socket data, ${TS_SUBNAME}:" |socat -u - UNIX-CONNECT:$DEVLOG - $TS_HELPER_LOGGER -u $DEVLOG --stderr "$@" >> "$TS_OUTPUT" 2>&1 + $TS_HELPER_LOGGER -u $DEVLOG --stderr "$@" >> $TS_OUTPUT 2>> $TS_ERRLOG echo "ret: $?" >> "$TS_OUTPUT" echo |socat -u - UNIX-CONNECT:$DEVLOG } @@ -49,7 +49,7 @@ function logger_printf { local fmt="$1" shift echo "socket data, ${TS_SUBNAME}:" |socat -u - UNIX-CONNECT:$DEVLOG - printf "$fmt" | $TS_HELPER_LOGGER -u $DEVLOG --stderr "$@" >> "$TS_OUTPUT" 2>&1 + printf "$fmt" | $TS_HELPER_LOGGER -u $DEVLOG --stderr "$@" >> $TS_OUTPUT 2>> $TS_ERRLOG echo "ret: $?" >> "$TS_OUTPUT" echo |socat -u - UNIX-CONNECT:$DEVLOG } @@ -107,7 +107,7 @@ ts_log "Check written socket data of all subtests." sleep 1 kill $SOCAT_PID wait $SOCAT_PID &>/dev/null -cat "$SOCKIN" >> "$TS_OUTPUT" 2>&1 +cat "$SOCKIN" >> $TS_OUTPUT 2>> $TS_ERRLOG rm -f "$DEVLOG" "$SOCKIN" ts_finalize_subtest diff --git a/tests/ts/logger/formats b/tests/ts/logger/formats index ea1a5d0196..82716c814f 100755 --- a/tests/ts/logger/formats +++ b/tests/ts/logger/formats @@ -37,8 +37,8 @@ ts_init_socket_to_file $DEVLOG $SOCKIN SOCAT_PID="$!" function logger_fun { - $TS_HELPER_LOGGER -u $DEVLOG -s --no-act "$@" >> "$TS_OUTPUT" 2>&1 - echo "ret: $?" >> "$TS_OUTPUT" + $TS_HELPER_LOGGER -u $DEVLOG --stderr --no-act "$@" >> $TS_OUTPUT 2>> $TS_ERRLOG + echo "ret: $?" >> "$TS_ERRLOG" # keep all in stderr } ts_init_subtest "rfc3164" @@ -74,11 +74,11 @@ done ts_finalize_subtest ts_init_subtest "check_socket" -ts_log "Check written socket data of all subtests." +# Check written socket data of all subtests sleep 1 kill $SOCAT_PID wait $SOCAT_PID &>/dev/null -cat "$SOCKIN" >> "$TS_OUTPUT" 2>&1 +cat "$SOCKIN" >> $TS_OUTPUT 2>> $TS_ERRLOG rm -f "$DEVLOG" "$SOCKIN" ts_finalize_subtest diff --git a/tests/ts/logger/journald b/tests/ts/logger/journald index c10824c0e9..9ed87ad5f9 100755 --- a/tests/ts/logger/journald +++ b/tests/ts/logger/journald @@ -30,6 +30,6 @@ if ! $TS_HELPER_LOGGER --help | grep -q journald; then fi printf "%s\n%s\n%s\n" MESSAGE_ID=b8f74e14bc714bfc8040a5106dc9376a MESSAGE="a b c 1 2 3" | -$TS_HELPER_LOGGER -u /bad/boy --no-act --journald --stderr > "$TS_OUTPUT" 2>&1 -echo "ret: $?" >> "$TS_OUTPUT" +$TS_HELPER_LOGGER -u /bad/boy --no-act --journald --stderr >> $TS_OUTPUT 2>> $TS_ERRLOG +echo "ret: $?" >> $TS_ERRLOG # keep it on stderr too ts_finalize diff --git a/tests/ts/logger/options b/tests/ts/logger/options index ffe1433616..30daea5d13 100755 --- a/tests/ts/logger/options +++ b/tests/ts/logger/options @@ -57,8 +57,8 @@ ts_init_socket_to_file $DEVLOG $SOCKIN SOCAT_PID="$!" function logger_fun { - $TS_HELPER_LOGGER -u $DEVLOG --stderr --no-act "$@" >> "$TS_OUTPUT" 2>&1 - echo "ret: $?" >> "$TS_OUTPUT" + $TS_HELPER_LOGGER -u $DEVLOG --stderr --no-act "$@" >> $TS_OUTPUT 2>> $TS_ERRLOG + echo "ret: $?" >> "$TS_ERRLOG" # keep all on stderr } for i in "${tests_array[@]}"; do @@ -71,11 +71,11 @@ for i in "${tests_array[@]}"; do done ts_init_subtest "check_socket" -ts_log "Check written socket data of all subtests." +# Check written socket data of all subtests sleep 1 kill $SOCAT_PID wait $SOCAT_PID &>/dev/null -cat "$SOCKIN" >> "$TS_OUTPUT" 2>&1 +cat "$SOCKIN" >> $TS_OUTPUT 2>> $TS_ERRLOG rm -f "$DEVLOG" "$SOCKIN" ts_finalize_subtest diff --git a/tests/ts/lsblk/lsblk b/tests/ts/lsblk/lsblk index d51438bc88..76232f3b88 100755 --- a/tests/ts/lsblk/lsblk +++ b/tests/ts/lsblk/lsblk @@ -46,7 +46,7 @@ for dump in $(ls $TS_SELF/dumps/*.tar.xz | sort); do cols=$(cat $cols_file) ${TS_CMD_LSBLK} --sysroot "${dumpdir}/${name}" \ --output $cols \ - >"${TS_OUTPUT}" 2>&1 + >> ${TS_OUTPUT} 2>> $TS_ERRLOG ts_finalize_subtest done diff --git a/tests/ts/lscpu/lscpu b/tests/ts/lscpu/lscpu index ccf2711496..d22400777f 100755 --- a/tests/ts/lscpu/lscpu +++ b/tests/ts/lscpu/lscpu @@ -37,17 +37,17 @@ for dump in $(ls $TS_SELF/dumps/*.tar.gz | sort); do # Architecture information is not applicable with -s. "${TS_CMD_LSCPU}" -s "${dumpdir}/${name}" | \ - grep -v "Architecture" >"${TS_OUTPUT}" 2>&1 + grep -v "Architecture" >> ${TS_OUTPUT} 2>> $TS_ERRLOG echo >>"${TS_OUTPUT}" "${TS_CMD_LSCPU}" -p -s "${dumpdir}/${name}" \ - >>"${TS_OUTPUT}" 2>&1 + >> ${TS_OUTPUT} 2>> $TS_ERRLOG echo >>"${TS_OUTPUT}" "${TS_CMD_LSCPU}" -p -y -s "${dumpdir}/${name}" \ - >>"${TS_OUTPUT}" 2>&1 + >> ${TS_OUTPUT} 2>> $TS_ERRLOG # LE/BE depends on binary sed -i -e '/Byte Order:.*/d' $TS_OUTPUT diff --git a/tests/ts/lsmem/lsmem b/tests/ts/lsmem/lsmem index bedf4143f3..7fdee55822 100755 --- a/tests/ts/lsmem/lsmem +++ b/tests/ts/lsmem/lsmem @@ -32,7 +32,7 @@ function do_lsmem { echo -e "\n---\n" >>${TS_OUTPUT} echo "\$ lsmem $opts" >>${TS_OUTPUT} - ${TS_CMD_LSMEM} $opts --sysroot "${dumpdir}/${name}" >>${TS_OUTPUT} 2>&1 + ${TS_CMD_LSMEM} $opts --sysroot "${dumpdir}/${name}" >> $TS_OUTPUT 2>> $TS_ERRLOG } diff --git a/tests/ts/minix/fsck b/tests/ts/minix/fsck index 21fbde8081..0ca86dfaea 100755 --- a/tests/ts/minix/fsck +++ b/tests/ts/minix/fsck @@ -26,14 +26,14 @@ ts_check_test_command "$TS_CMD_FSCKMINIX" mkfs_and_fsck_minix() { local ret ts_log "#####################################" - ts_log "$ mkfs.minix $1 image" - $TS_CMD_MKMINIX $1 $img >> $TS_OUTPUT 2>&1 + ts_log_both "$ mkfs.minix $1 image" + $TS_CMD_MKMINIX $1 $img >> $TS_OUTPUT 2>> $TS_ERRLOG ret=$? echo "return mkfs: $ret" >> $TS_OUTPUT test $ret = 0 || return $ret - ts_log "$ fsck.minix -lavsf image" - $TS_CMD_FSCKMINIX -lavsf $img >> $TS_OUTPUT 2>&1 + ts_log_both "$ fsck.minix -lavsf image" + $TS_CMD_FSCKMINIX -lavsf $img >> $TS_OUTPUT 2>> $TS_ERRLOG ret=$? echo "return fsck: $ret" >> $TS_OUTPUT return $ret diff --git a/tests/ts/minix/fsck-images b/tests/ts/minix/fsck-images index 0cfa760143..4c204228b5 100755 --- a/tests/ts/minix/fsck-images +++ b/tests/ts/minix/fsck-images @@ -37,11 +37,11 @@ check_minix_fs_type() { TS_EXPECTED+=$BE_EXT img=${TS_OUTPUT}.img dd if=/dev/zero bs=1024 count=16 of=$img >/dev/null 2>&1 - $TS_HELPER_MKFS_MINIX $2 $img >> $TS_OUTPUT 2>&1 + $TS_HELPER_MKFS_MINIX $2 $img >> $TS_OUTPUT 2>> $TS_ERRLOG echo "mkfs return value: $?" >> $TS_OUTPUT - $TS_CMD_FSCKMINIX $img >> $TS_OUTPUT 2>&1 + $TS_CMD_FSCKMINIX $img >> $TS_OUTPUT 2>> $TS_ERRLOG echo "fsck return value: $?" >> $TS_OUTPUT - $TS_CMD_HEXDUMP -C $img >> $TS_OUTPUT 2>&1 + $TS_CMD_HEXDUMP -C $img >> $TS_OUTPUT 2>> $TS_ERRLOG rm -f $img ts_finalize_subtest } @@ -71,19 +71,19 @@ fi ts_init_subtest "auto-fix" img=${TS_OUTPUT}.img cp "$TS_SELF/broken-root" $img -$TS_CMD_FSCKMINIX -sav $img >> $TS_OUTPUT 2>&1 +$TS_CMD_FSCKMINIX -sav $img >> $TS_OUTPUT 2>> $TS_ERRLOG echo "fsck reports changed and uncorrected: $?" >> $TS_OUTPUT -$TS_CMD_HEXDUMP -C $img >> $TS_OUTPUT 2>&1 -sed -i 's/Filesystem on .* is dirty/Filesystem auto-fix is dirty/' $TS_OUTPUT +$TS_CMD_HEXDUMP -C $img >> $TS_OUTPUT 2>> $TS_ERRLOG +sed -i 's/Filesystem on .* is dirty/Filesystem auto-fix is dirty/' $TS_OUTPUT $TS_ERRLOG ts_finalize_subtest ts_init_subtest "bug.773892" -"$TS_CMD_FSCKMINIX" -f "$TS_SELF/debian.bug.773892" >>$TS_OUTPUT 2>&1 >/dev/null +"$TS_CMD_FSCKMINIX" -f "$TS_SELF/debian.bug.773892" 2>&1 >/dev/null echo "fsck reports uncorrected: $?" >> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "broken-root" -"$TS_CMD_FSCKMINIX" "$TS_SELF/broken-root" > $TS_OUTPUT 2>&1 +"$TS_CMD_FSCKMINIX" "$TS_SELF/broken-root" >> $TS_OUTPUT 2>> $TS_ERRLOG echo "fsck reports uncorrected: $?" >> $TS_OUTPUT ts_finalize_subtest diff --git a/tests/ts/minix/mkfs b/tests/ts/minix/mkfs index 6c3a00247e..27ed957622 100755 --- a/tests/ts/minix/mkfs +++ b/tests/ts/minix/mkfs @@ -34,7 +34,7 @@ test -b $dev || sleep 1 mkfs_and_mount_minix() { ts_init_subtest $1 ts_log "create minix fs $2" - $TS_CMD_MKMINIX $2 $dev >> $TS_OUTPUT 2>&1 + $TS_CMD_MKMINIX $2 $dev >> $TS_OUTPUT 2>> $TS_ERRLOG echo "mkfs return value: $?" >> $TS_OUTPUT udevadm settle [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT diff --git a/tests/ts/misc/fallocate b/tests/ts/misc/fallocate index b37d025917..2f77ee928a 100755 --- a/tests/ts/misc/fallocate +++ b/tests/ts/misc/fallocate @@ -24,8 +24,8 @@ ts_check_test_command "$TS_CMD_FINDMNT" IMAGE=${TS_OUTDIR}/${TS_TESTNAME}.file rm -f $IMAGE -if $TS_CMD_FALLOCATE -o 128 -l 256 $IMAGE > $TS_OUTPUT 2>&1; then - stat -c "%s" $IMAGE >> $TS_OUTPUT 2>&1 +if $TS_CMD_FALLOCATE -o 128 -l 256 $IMAGE >> $TS_OUTPUT 2>> $TS_ERRLOG; then + stat -c "%s" $IMAGE >> $TS_OUTPUT 2>> $TS_ERRLOG else # fs type of $TS_OUTDIR, could be used to skip this test early fs_type=$(${TS_CMD_FINDMNT} -n -o FSTYPE -T ${TS_OUTDIR}) diff --git a/tests/ts/misc/flock b/tests/ts/misc/flock index 6a43fea40d..30be0405e7 100755 --- a/tests/ts/misc/flock +++ b/tests/ts/misc/flock @@ -30,7 +30,7 @@ function do_lock { $TS_CMD_FLOCK $1 $TS_OUTDIR/lockfile \ echo "$mesg" \ - > $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG local rc="$?" diff --git a/tests/ts/misc/ionice b/tests/ts/misc/ionice index 32b22598a1..81cc0f86d8 100755 --- a/tests/ts/misc/ionice +++ b/tests/ts/misc/ionice @@ -20,11 +20,11 @@ ts_init "$*" ts_check_test_command "$TS_CMD_IONICE" -$TS_CMD_IONICE -p $$ -n 0 -c 0 >> $TS_OUTPUT 2>&1 -$TS_CMD_IONICE -p $$ -n 3 -c 7 >> $TS_OUTPUT 2>&1 -$TS_CMD_IONICE -p $$ -n 4 -c 7 >> $TS_OUTPUT 2>&1 -$TS_CMD_IONICE -p $$ -n 1 -c 8 >> $TS_OUTPUT 2>&1 -$TS_CMD_IONICE -n 3 ls /etc/passwd >> $TS_OUTPUT 2>&1 -$TS_CMD_IONICE -p $$ >> $TS_OUTPUT 2>&1 +$TS_CMD_IONICE -p $$ -n 0 -c 0 >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IONICE -p $$ -n 3 -c 7 >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IONICE -p $$ -n 4 -c 7 >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IONICE -p $$ -n 1 -c 8 >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IONICE -n 3 ls /etc/passwd >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IONICE -p $$ >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize diff --git a/tests/ts/misc/line b/tests/ts/misc/line index 186a78958f..62fcb7964d 100755 --- a/tests/ts/misc/line +++ b/tests/ts/misc/line @@ -23,36 +23,36 @@ ts_check_test_command "$TS_CMD_HEXDUMP" ts_log '# usually behave like "head -n 1"' printf "a\nb\n" | - $TS_CMD_LINE >> $TS_OUTPUT 2>&1 + $TS_CMD_LINE >> $TS_OUTPUT 2>> $TS_ERRLOG echo "ret: $?" >> $TS_OUTPUT ts_log '# never consume more than one line' printf "1\n2\n" | - ($TS_CMD_LINE && $TS_CMD_LINE) >> $TS_OUTPUT 2>&1 + ($TS_CMD_LINE && $TS_CMD_LINE) >> $TS_OUTPUT 2>> $TS_ERRLOG echo "ret: $?" >> $TS_OUTPUT ts_log '# add a newline' printf "abc" | - $TS_CMD_LINE >> $TS_OUTPUT 2>&1 + $TS_CMD_LINE >> $TS_OUTPUT 2>> $TS_ERRLOG echo "ret: $?" >> $TS_OUTPUT ts_log '# print one newline on empty input' printf "" | - $TS_CMD_LINE >> $TS_OUTPUT 2>&1 + $TS_CMD_LINE >> $TS_OUTPUT 2>> $TS_ERRLOG echo "ret: $?" >> $TS_OUTPUT ts_log '# add a newline, return 1 when EOF' (printf "xyz" && cat > $TS_OUTPUT 2>&1 + $TS_CMD_LINE >> $TS_OUTPUT 2>> $TS_ERRLOG echo "ret: $?" >> $TS_OUTPUT ts_log '# print one newline on empty input, return 1 when EOF' -$TS_CMD_LINE > $TS_OUTPUT 2>&1 +$TS_CMD_LINE > $TS_OUTPUT 2>> $TS_ERRLOG echo "ret: $?" >> $TS_OUTPUT ts_log '# large line of zero bytes' dd if=/dev/zero bs=1k count=1k 2>/dev/null | - $TS_CMD_LINE line | $TS_CMD_HEXDUMP -C >> $TS_OUTPUT 2>&1 + $TS_CMD_LINE line | $TS_CMD_HEXDUMP -C >> $TS_OUTPUT 2>> $TS_ERRLOG echo "ret: $?" >> $TS_OUTPUT ts_finalize diff --git a/tests/ts/misc/mbsencode b/tests/ts/misc/mbsencode index 2dea772e5a..cc3a540caa 100755 --- a/tests/ts/misc/mbsencode +++ b/tests/ts/misc/mbsencode @@ -52,12 +52,12 @@ else fi ts_init_subtest "safe-ascii" -$TS_HELPER_MBSENCODE --safe "${STRINGS[@]}" >> $TS_OUTPUT 2>&1 +$TS_HELPER_MBSENCODE --safe "${STRINGS[@]}" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "invalid-ascii" if [ "$HAVE_WIDECHAR" = true ]; then - $TS_HELPER_MBSENCODE --invalid "${STRINGS[@]}" >> $TS_OUTPUT 2>&1 + $TS_HELPER_MBSENCODE --invalid "${STRINGS[@]}" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest else ts_skip_subtest 'No widechar support' @@ -66,7 +66,7 @@ fi ts_init_subtest "safe-utf8" if [ "$HAVE_WIDECHAR" = true ]; then LC_ALL=C.UTF-8 \ - $TS_HELPER_MBSENCODE --safe "${STRINGS[@]}" >> $TS_OUTPUT 2>&1 + $TS_HELPER_MBSENCODE --safe "${STRINGS[@]}" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest else ts_skip_subtest 'No widechar support' @@ -75,7 +75,7 @@ fi ts_init_subtest "invalid-utf8" if [ "$HAVE_WIDECHAR" = true ]; then LC_ALL=C.UTF-8 \ - $TS_HELPER_MBSENCODE --invalid "${STRINGS[@]}" >> $TS_OUTPUT 2>&1 + $TS_HELPER_MBSENCODE --invalid "${STRINGS[@]}" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest else ts_skip_subtest 'No widechar support' diff --git a/tests/ts/misc/mcookie b/tests/ts/misc/mcookie index 96e3cc70aa..99312162e4 100755 --- a/tests/ts/misc/mcookie +++ b/tests/ts/misc/mcookie @@ -23,6 +23,6 @@ ts_check_test_command "$TS_CMD_MCOOKIE" $TS_CMD_MCOOKIE -f /etc/services | # The sed will convert only 32 characters long hexadecimal string # to expected string, but nothing else. - sed 's/^[0-9a-f]\{32\}$/the string meets expecations/' > $TS_OUTPUT 2>&1 + sed 's/^[0-9a-f]\{32\}$/the string meets expecations/' >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize diff --git a/tests/ts/misc/mountpoint b/tests/ts/misc/mountpoint index 03c1ccc3ee..1b391c3bfb 100755 --- a/tests/ts/misc/mountpoint +++ b/tests/ts/misc/mountpoint @@ -11,18 +11,18 @@ ts_check_test_command "$TS_CMD_MOUNTPOINT" ln -s / ./symlink-to-root ts_init_subtest "default" -$TS_CMD_MOUNTPOINT ./symlink-to-root >> $TS_OUTPUT 2>&1 -echo $? >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNTPOINT ./symlink-to-root >> $TS_OUTPUT 2>> $TS_ERRLOG +echo $? >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "nofollow" -$TS_CMD_MOUNTPOINT --nofollow ./symlink-to-root >> $TS_OUTPUT 2>&1 -echo $? >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNTPOINT --nofollow ./symlink-to-root >> $TS_OUTPUT 2>> $TS_ERRLOG +echo $? >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_init_subtest "mutually-exclusive" -$TS_CMD_MOUNTPOINT --devno --nofollow / >> $TS_OUTPUT 2>&1 -echo $? >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNTPOINT --devno --nofollow / >> $TS_OUTPUT 2>> $TS_ERRLOG +echo $? >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest rm -f ./symlink-to-root diff --git a/tests/ts/misc/rev b/tests/ts/misc/rev index 3a541ac045..0b3b64c09d 100755 --- a/tests/ts/misc/rev +++ b/tests/ts/misc/rev @@ -21,11 +21,11 @@ ts_init "$*" ts_check_test_command "$TS_CMD_REV" ts_check_test_command "$TS_HELPER_MD5" -for I in {0..512}; do printf "%s " {a..z}; done | "$TS_HELPER_MD5" >> $TS_OUTPUT 2>&1 +for I in {0..512}; do printf "%s " {a..z}; done | "$TS_HELPER_MD5" >> $TS_OUTPUT 2>> $TS_ERRLOG for I in {0..512}; do printf "%s " {a..z}; done | \ - $TS_CMD_REV | "$TS_HELPER_MD5" >> $TS_OUTPUT 2>&1 + $TS_CMD_REV | "$TS_HELPER_MD5" >> $TS_OUTPUT 2>> $TS_ERRLOG -printf "abc\n123" | $TS_CMD_REV >> $TS_OUTPUT 2>&1 +printf "abc\n123" | $TS_CMD_REV >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize diff --git a/tests/ts/misc/setarch b/tests/ts/misc/setarch index c8050e52a0..7c99ccad2e 100755 --- a/tests/ts/misc/setarch +++ b/tests/ts/misc/setarch @@ -23,21 +23,21 @@ ts_check_test_command "$TS_CMD_SETARCH" ARCH=$(uname -m) ts_init_subtest options -echo "###### unknown arch" >>$TS_OUTPUT -$TS_CMD_SETARCH qubit -v echo "success" >>$TS_OUTPUT 2>&1 +ts_log_both "###### unknown arch" +$TS_CMD_SETARCH qubit -v echo "success" >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit: $?" >>$TS_OUTPUT -echo "###### unknown command" >>$TS_OUTPUT -$TS_CMD_SETARCH $ARCH -v /das/gibs/nicht >>$TS_OUTPUT 2>&1 +ts_log_both "###### unknown command" +$TS_CMD_SETARCH $ARCH -v /das/gibs/nicht >> $TS_OUTPUT 2>> $TS_ERRLOG echo "exit: $?" >>$TS_OUTPUT echo "###### noop uname -a" >>$TS_OUTPUT uname_a=$(uname -srm) -$TS_CMD_SETARCH $ARCH -v uname -srm >>$TS_OUTPUT 2>&1 +$TS_CMD_SETARCH $ARCH -v uname -srm >> $TS_OUTPUT 2>> $TS_ERRLOG sed -i "$ s@${uname_a}@uname -a unchanged@" $TS_OUTPUT echo "###### almost all options" >>$TS_OUTPUT -$TS_CMD_SETARCH $ARCH -vRFZLXBIST3 echo "success" >>$TS_OUTPUT 2>&1 +$TS_CMD_SETARCH $ARCH -vRFZLXBIST3 echo "success" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest @@ -45,7 +45,7 @@ ts_init_subtest uname26 finmsg="" # for debugging 2.6 issues echo "###### --uname-2.6 echo" >>$TS_OUTPUT -$TS_CMD_SETARCH $ARCH -v --uname-2.6 echo "2.6 worked" >>$TS_OUTPUT 2>&1 +$TS_CMD_SETARCH $ARCH -v --uname-2.6 echo "2.6 worked" >> $TS_OUTPUT 2>> $TS_ERRLOG if [ $? -eq 0 ]; then expected='^2.6 worked$' else @@ -56,7 +56,7 @@ fi sed -i "$ s/$expected/2.6 works or kernel too old/" $TS_OUTPUT echo "###### --uname-2.6 true, non-verbose" >>$TS_OUTPUT -$TS_CMD_SETARCH $ARCH --uname-2.6 true >>$TS_OUTPUT 2>&1 +$TS_CMD_SETARCH $ARCH --uname-2.6 true >> $TS_OUTPUT 2>> $TS_ERRLOG if [ $? -eq 0 ]; then echo "2.6 works or kernel too old" >> $TS_OUTPUT else diff --git a/tests/ts/misc/setsid b/tests/ts/misc/setsid index baef70d432..dc4a32904a 100755 --- a/tests/ts/misc/setsid +++ b/tests/ts/misc/setsid @@ -20,6 +20,6 @@ ts_init "$*" ts_check_test_command "$TS_CMD_SETSID" -$TS_CMD_SETSID echo "success" > $TS_OUTPUT 2>&1 +$TS_CMD_SETSID echo "success" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize diff --git a/tests/ts/misc/strtosize b/tests/ts/misc/strtosize index a5914a9391..7d78c35834 100755 --- a/tests/ts/misc/strtosize +++ b/tests/ts/misc/strtosize @@ -23,40 +23,40 @@ ts_init "$*" ts_check_test_command "$TS_HELPER_STRUTILS" -$TS_HELPER_STRUTILS --size -1 >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 0 >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 1 >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 123 >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 18446744073709551615 >> $TS_OUTPUT 2>&1 - -$TS_HELPER_STRUTILS --size 1K >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 1KiB >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 1M >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 1MiB >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 1G >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 1GiB >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 1T >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 1TiB >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 1P >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 1PiB >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 1E >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 1EiB >> $TS_OUTPUT 2>&1 - -$TS_HELPER_STRUTILS --size 1KB >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 1MB >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 1GB >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 1TB >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 1PB >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 1EB >> $TS_OUTPUT 2>&1 - -$TS_HELPER_STRUTILS --size "" >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size " " >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size " 1" >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size "1 " >> $TS_OUTPUT 2>&1 - -$TS_HELPER_STRUTILS --size 0x0a >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 0xff00 >> $TS_OUTPUT 2>&1 -$TS_HELPER_STRUTILS --size 0x80000000 >> $TS_OUTPUT 2>&1 +$TS_HELPER_STRUTILS --size -1 >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 0 >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 1 >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 123 >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 18446744073709551615 >> $TS_OUTPUT 2>> $TS_ERRLOG + +$TS_HELPER_STRUTILS --size 1K >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 1KiB >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 1M >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 1MiB >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 1G >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 1GiB >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 1T >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 1TiB >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 1P >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 1PiB >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 1E >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 1EiB >> $TS_OUTPUT 2>> $TS_ERRLOG + +$TS_HELPER_STRUTILS --size 1KB >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 1MB >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 1GB >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 1TB >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 1PB >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 1EB >> $TS_OUTPUT 2>> $TS_ERRLOG + +$TS_HELPER_STRUTILS --size "" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size " " >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size " 1" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size "1 " >> $TS_OUTPUT 2>> $TS_ERRLOG + +$TS_HELPER_STRUTILS --size 0x0a >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 0xff00 >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_HELPER_STRUTILS --size 0x80000000 >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize diff --git a/tests/ts/misc/swaplabel b/tests/ts/misc/swaplabel index 106cb7d213..5a1bb46fb9 100755 --- a/tests/ts/misc/swaplabel +++ b/tests/ts/misc/swaplabel @@ -46,7 +46,7 @@ ts_run --unbuffered $TS_CMD_MKSWAP \ 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>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG rm -f $IMAGE fallocate_or_skip $MIN_SWAP_SIZE $IMAGE @@ -58,8 +58,8 @@ ts_run --unbuffered $TS_CMD_MKSWAP \ -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>&1 -$TS_CMD_SWAPLABEL $IMAGE >> $TS_OUTPUT 2>&1 + >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SWAPLABEL $IMAGE >> $TS_OUTPUT 2>> $TS_ERRLOG #rm -f $IMAGE diff --git a/tests/ts/misc/ul b/tests/ts/misc/ul index 2c2c1da542..b856e33db9 100755 --- a/tests/ts/misc/ul +++ b/tests/ts/misc/ul @@ -21,6 +21,6 @@ ts_init "$*" ts_check_test_command "$TS_CMD_UL" printf "a\x08ab\x5F\x08c\\n\\ttab\\f\\b\\r" | - $TS_CMD_UL -t xterm > $TS_OUTPUT 2>&1 + $TS_CMD_UL -t xterm >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize diff --git a/tests/ts/more/regexp b/tests/ts/more/regexp index 7b4f39652b..869d71205d 100755 --- a/tests/ts/more/regexp +++ b/tests/ts/more/regexp @@ -22,6 +22,6 @@ ts_check_test_command "$TS_HELPER_MORE" export TERM=linux printf "abba\nbar\nfoo\nxyzzy\n" | - $TS_HELPER_MORE +/foo > $TS_OUTPUT 2>&1 + $TS_HELPER_MORE +/foo >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize diff --git a/tests/ts/more/squeeze b/tests/ts/more/squeeze index d5b4a6ab7f..3b17ddb75c 100755 --- a/tests/ts/more/squeeze +++ b/tests/ts/more/squeeze @@ -21,6 +21,6 @@ ts_init "$*" ts_check_test_command "$TS_HELPER_MORE" printf "a\n\n\nb\n" | - $TS_HELPER_MORE -s > $TS_OUTPUT 2>&1 + $TS_HELPER_MORE -s >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize diff --git a/tests/ts/mount/devname b/tests/ts/mount/devname index 4db878bb6d..a311a43ee7 100755 --- a/tests/ts/mount/devname +++ b/tests/ts/mount/devname @@ -44,17 +44,17 @@ ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT -$TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" grep -q "\(^\| \)$DEVICE " $MTAB_FILE || - echo "mount failed: cannot find $DEVICE in $MTAB_FILE" >> $TS_OUTPUT 2>&1 + echo "mount failed: cannot find $DEVICE in $MTAB_FILE" >> $TS_OUTPUT 2>> $TS_ERRLOG $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" grep -q "\(^\| \)$DEVICE " $MTAB_FILE && - echo "umount failed: found $DEVICE in $MTAB_FILE" >> $TS_OUTPUT 2>&1 + echo "umount failed: found $DEVICE in $MTAB_FILE" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_log "Success" ts_finalize diff --git a/tests/ts/mount/fslists b/tests/ts/mount/fslists index de485319ad..cb243d5ea0 100755 --- a/tests/ts/mount/fslists +++ b/tests/ts/mount/fslists @@ -42,7 +42,7 @@ ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" ts_init_subtest "one-type" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT -$TS_CMD_MOUNT -t ext3 $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -t ext3 $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $TS_MOUNTPOINT ts_log "Success" @@ -51,7 +51,7 @@ ts_finalize_subtest ts_init_subtest "more-types" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT -$TS_CMD_MOUNT -t foo,bar,ext3 $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -t foo,bar,ext3 $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $TS_MOUNTPOINT ts_log "Success" @@ -61,7 +61,7 @@ ts_finalize_subtest ts_init_subtest "more-types-fstab" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT ts_fstab_add $DEVICE $TS_MOUNTPOINT "foo,bar,ext3" -$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fstab_clean ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $TS_MOUNTPOINT @@ -71,7 +71,7 @@ ts_finalize_subtest ts_init_subtest "type-pattern" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT -$TS_CMD_MOUNT -i -t nofoo,bar $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -i -t nofoo,bar $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $TS_MOUNTPOINT ts_log "Success" diff --git a/tests/ts/mount/fstab-btrfs b/tests/ts/mount/fstab-btrfs index 54c6bb8ba2..0003b5d65f 100755 --- a/tests/ts/mount/fstab-btrfs +++ b/tests/ts/mount/fstab-btrfs @@ -91,16 +91,16 @@ ts_fstab_addline "$DEVICE" "$TS_MOUNTPOINT_SUBVOLID" "btrfs" "subvolid=$NON_DEFA ts_fstab_addline "$TS_MOUNTPOINT_SUBVOLID" "$TS_MOUNTPOINT_BIND" "auto" "bind" ts_fstab_close -$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>&1 -$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG -$TS_CMD_UMOUNT "$TS_MOUNTPOINT_BIND" >> $TS_OUTPUT 2>&1 -$TS_CMD_UMOUNT "$TS_MOUNTPOINT_DEFAULT" >> $TS_OUTPUT 2>&1 -$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOL" >> $TS_OUTPUT 2>&1 -$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOLID" >> $TS_OUTPUT 2>&1 +$TS_CMD_UMOUNT "$TS_MOUNTPOINT_BIND" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_UMOUNT "$TS_MOUNTPOINT_DEFAULT" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOL" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOLID" >> $TS_OUTPUT 2>> $TS_ERRLOG # check that everything was unmounted -$TS_CMD_MOUNT | grep "$TS_MOUNTPOINT_ANY" >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT | grep "$TS_MOUNTPOINT_ANY" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fstab_clean # this unlock too ts_log "Success" @@ -121,16 +121,16 @@ ts_fstab_addline "$DEVICE" "$TS_MOUNTPOINT_SUBVOLID" "auto" "subvolid=$NON_DEFAU ts_fstab_addline "$TS_MOUNTPOINT_SUBVOL/bind-mnt" "$TS_MOUNTPOINT_BIND" "auto" "bind" ts_fstab_close -$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>&1 -$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG -$TS_CMD_UMOUNT "$TS_MOUNTPOINT_BIND" >> $TS_OUTPUT 2>&1 -$TS_CMD_UMOUNT "$TS_MOUNTPOINT_DEFAULT" >> $TS_OUTPUT 2>&1 -$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOL" >> $TS_OUTPUT 2>&1 -$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOLID" >> $TS_OUTPUT 2>&1 +$TS_CMD_UMOUNT "$TS_MOUNTPOINT_BIND" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_UMOUNT "$TS_MOUNTPOINT_DEFAULT" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOL" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_UMOUNT "$TS_MOUNTPOINT_SUBVOLID" >> $TS_OUTPUT 2>> $TS_ERRLOG # check that everything was unmounted -$TS_CMD_MOUNT | grep "$TS_MOUNTPOINT_ANY" >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT | grep "$TS_MOUNTPOINT_ANY" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fstab_clean # this unlock too ts_log "Success" diff --git a/tests/ts/mount/fstab-devname b/tests/ts/mount/fstab-devname index 6648784d3f..95a014dae0 100755 --- a/tests/ts/mount/fstab-devname +++ b/tests/ts/mount/fstab-devname @@ -40,12 +40,12 @@ ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" ts_fstab_add $DEVICE # variant A) -$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" # variant B) -$TS_CMD_MOUNT $DEVICE >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" diff --git a/tests/ts/mount/fstab-devname2label b/tests/ts/mount/fstab-devname2label index 02ef1ef18d..cd39dfd89c 100755 --- a/tests/ts/mount/fstab-devname2label +++ b/tests/ts/mount/fstab-devname2label @@ -41,7 +41,7 @@ ts_device_has "LABEL" $LABEL $DEVICE \ ts_fstab_add "LABEL=$LABEL" ts_udevadm_settle "$DEVICE" "LABEL" -$TS_CMD_MOUNT $DEVICE >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" diff --git a/tests/ts/mount/fstab-devname2uuid b/tests/ts/mount/fstab-devname2uuid index 4cd4f4502c..90c61c3098 100755 --- a/tests/ts/mount/fstab-devname2uuid +++ b/tests/ts/mount/fstab-devname2uuid @@ -39,7 +39,7 @@ UUID=$(ts_uuid_by_devname "$DEVICE") || ts_die "Cannot find UUID on $DEVICE" ts_fstab_add "UUID=$UUID" ts_udevadm_settle "$DEVICE" "UUID" -$TS_CMD_MOUNT $DEVICE >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" diff --git a/tests/ts/mount/fstab-label b/tests/ts/mount/fstab-label index be6292d17e..5f40a87479 100755 --- a/tests/ts/mount/fstab-label +++ b/tests/ts/mount/fstab-label @@ -42,17 +42,17 @@ ts_fstab_add "LABEL=$LABEL" ts_udevadm_settle "$DEVICE" "LABEL" # variant A) -$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" # variant B) -$TS_CMD_MOUNT -L $LABEL >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" # variant C) -$TS_CMD_MOUNT LABEL=$LABEL >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT LABEL=$LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "C) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "C) Cannot umount $DEVICE" diff --git a/tests/ts/mount/fstab-label2devname b/tests/ts/mount/fstab-label2devname index ee4642e250..e9cebb38e5 100755 --- a/tests/ts/mount/fstab-label2devname +++ b/tests/ts/mount/fstab-label2devname @@ -42,12 +42,12 @@ ts_fstab_add "$DEVICE" ts_udevadm_settle "$DEVICE" "LABEL" # variant A) -$TS_CMD_MOUNT -L $LABEL >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" # variant B) -$TS_CMD_MOUNT "LABEL=$LABEL" >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT "LABEL=$LABEL" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" diff --git a/tests/ts/mount/fstab-label2uuid b/tests/ts/mount/fstab-label2uuid index 0d2b93154e..1a97bc0d56 100755 --- a/tests/ts/mount/fstab-label2uuid +++ b/tests/ts/mount/fstab-label2uuid @@ -44,12 +44,12 @@ ts_fstab_add "UUID=$UUID" ts_udevadm_settle "$DEVICE" "LABEL" "UUID" # variant A) -$TS_CMD_MOUNT -L $LABEL >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" # variant B) -$TS_CMD_MOUNT "LABEL=$LABEL" >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT "LABEL=$LABEL" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" diff --git a/tests/ts/mount/fstab-loop b/tests/ts/mount/fstab-loop index 4104a62a0b..4b56694c87 100755 --- a/tests/ts/mount/fstab-loop +++ b/tests/ts/mount/fstab-loop @@ -39,15 +39,15 @@ ts_fstab_lock ts_fstab_open ts_fstab_addline "$IMG" "$TS_MOUNTPOINT-1" "ext3" "loop" -$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fstab_addline "$IMG" "$TS_MOUNTPOINT-2" "ext3" "loop" -$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fstab_close -$TS_CMD_UMOUNT "$TS_MOUNTPOINT-1" >> $TS_OUTPUT 2>&1 -$TS_CMD_UMOUNT "$TS_MOUNTPOINT-2" >> $TS_OUTPUT 2>&1 +$TS_CMD_UMOUNT "$TS_MOUNTPOINT-1" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_UMOUNT "$TS_MOUNTPOINT-2" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fstab_clean diff --git a/tests/ts/mount/fstab-none b/tests/ts/mount/fstab-none index 65b3b7a5a7..e2ed0af024 100755 --- a/tests/ts/mount/fstab-none +++ b/tests/ts/mount/fstab-none @@ -16,7 +16,7 @@ ts_fstab_add "none" "$TS_MOUNTPOINT" "tmpfs" "rw,nosuid,nodev,relatime" mkdir -p $TS_MOUNTPOINT -$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG [ "$?" = "0" ] || ts_log "error: mount $TS_MOUNTPOINT" $TS_CMD_FINDMNT --mountpoint "$TS_MOUNTPOINT" &> /dev/null diff --git a/tests/ts/mount/fstab-symlink b/tests/ts/mount/fstab-symlink index 1a12b85800..c791f3127d 100755 --- a/tests/ts/mount/fstab-symlink +++ b/tests/ts/mount/fstab-symlink @@ -46,7 +46,7 @@ ln -s $DEVICE $LINKNAME ts_fstab_add $LINKNAME $TS_MOUNTPOINT "auto" "defaults,user" # variant A) -- UID=0 -$TS_CMD_MOUNT $LINKNAME >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT $LINKNAME >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $LINKNAME || ts_die "A) Cannot umount $LINKNAME" @@ -57,10 +57,10 @@ $TS_CMD_UMOUNT $LINKNAME || ts_die "A) Cannot umount $LINKNAME" #ts_init_suid $TS_CMD_MOUNT #ts_init_suid $TS_CMD_UMOUNT # -#su $TS_TESTUSER -c "$TS_CMD_MOUNT -v -v -v $LINKNAME" >> $TS_OUTPUT 2>&1 +#su $TS_TESTUSER -c "$TS_CMD_MOUNT -v -v -v $LINKNAME" >> $TS_OUTPUT 2>> $TS_ERRLOG #ts_is_mounted $DEVICE # || ts_die "B) Cannot find $DEVICE in /proc/mounts" -#su $TS_TESTUSER -c "$TS_CMD_UMOUNT $LINKNAME" >> $TS_OUTPUT 2>&1 \ +#su $TS_TESTUSER -c "$TS_CMD_UMOUNT $LINKNAME" >> $TS_OUTPUT 2>> $TS_ERRLOG \ # || ts_die "B) Cannot umount $LINKNAME" ts_fstab_clean diff --git a/tests/ts/mount/fstab-uuid b/tests/ts/mount/fstab-uuid index 1c588fc1b1..fa6ddff3fa 100755 --- a/tests/ts/mount/fstab-uuid +++ b/tests/ts/mount/fstab-uuid @@ -40,17 +40,17 @@ ts_fstab_add "UUID=$UUID" ts_udevadm_settle "$DEVICE" "UUID" # varian A) -$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" # varian B) -$TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" # varian C) -$TS_CMD_MOUNT UUID=$UUID >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT UUID=$UUID >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "C) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "C) Cannot umount $DEVICE" diff --git a/tests/ts/mount/fstab-uuid2devname b/tests/ts/mount/fstab-uuid2devname index 39aed65a93..47c7a7315a 100755 --- a/tests/ts/mount/fstab-uuid2devname +++ b/tests/ts/mount/fstab-uuid2devname @@ -40,12 +40,12 @@ ts_fstab_add "$DEVICE" ts_udevadm_settle "$DEVICE" "UUID" # variant A) -$TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" # variant B) -$TS_CMD_MOUNT "UUID=$UUID" >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT "UUID=$UUID" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" diff --git a/tests/ts/mount/fstab-uuid2label b/tests/ts/mount/fstab-uuid2label index 4676c9a7b6..9b0c61508a 100755 --- a/tests/ts/mount/fstab-uuid2label +++ b/tests/ts/mount/fstab-uuid2label @@ -43,12 +43,12 @@ ts_fstab_add "LABEL=$LABEL" ts_udevadm_settle "$DEVICE" "LABEL" "UUID" # variant A) -$TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" # variant B) -$TS_CMD_MOUNT "UUID=$UUID" >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT "UUID=$UUID" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" diff --git a/tests/ts/mount/label b/tests/ts/mount/label index 45da02b6ef..adb4ac1209 100755 --- a/tests/ts/mount/label +++ b/tests/ts/mount/label @@ -41,12 +41,12 @@ ts_device_has "LABEL" $LABEL $DEVICE \ ts_udevadm_settle "$DEVICE" "LABEL" # variant A) -$TS_CMD_MOUNT -L $LABEL $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -L $LABEL $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" # variant B) -$TS_CMD_MOUNT LABEL=$LABEL $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT LABEL=$LABEL $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" diff --git a/tests/ts/mount/regfile b/tests/ts/mount/regfile index 4f5ce303ac..8cdf6956a7 100755 --- a/tests/ts/mount/regfile +++ b/tests/ts/mount/regfile @@ -21,7 +21,7 @@ mkfs.ext3 -F $IMAGE &> /dev/null || ts_die "Cannot make ext3 on $IMAGE" [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT -$TS_CMD_MOUNT $IMAGE $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT $IMAGE $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG DEVICE=$(awk '/regfile/ { print $1 }' /proc/mounts) diff --git a/tests/ts/mount/shared-subtree b/tests/ts/mount/shared-subtree index 038e025728..fe6e27d268 100755 --- a/tests/ts/mount/shared-subtree +++ b/tests/ts/mount/shared-subtree @@ -29,18 +29,18 @@ MOUNTPOINT="$TS_MOUNTPOINT" ts_init_subtest "make-shared" -$TS_CMD_MOUNT --make-shared $MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT --make-shared $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG $TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "make-private" -$TS_CMD_MOUNT --make-private $MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT --make-private $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG $TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT ts_finalize_subtest ts_init_subtest "make-unbindable" -$TS_CMD_MOUNT --make-unbindable $MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT --make-unbindable $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG $TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT ts_finalize_subtest @@ -50,7 +50,7 @@ $TS_CMD_UMOUNT $MOUNTPOINT ts_init_subtest "bind-shared" $TS_CMD_MOUNT --make-shared \ - --bind $MOUNTPOINT $MOUNTPOINT >> $TS_OUTPUT 2>&1 + --bind $MOUNTPOINT $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG $TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT $TS_CMD_UMOUNT $MOUNTPOINT ts_finalize_subtest @@ -68,13 +68,13 @@ ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" ts_init_subtest "mount-private" $TS_CMD_MOUNT --make-private --make-unbindable \ - $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 + $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG $TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT $TS_CMD_UMOUNT $MOUNTPOINT ts_finalize_subtest ts_init_subtest "mount-private-ro" -$TS_CMD_MOUNT $DEVICE $MOUNTPOINT -o ro,private >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT $DEVICE $MOUNTPOINT -o ro,private >> $TS_OUTPUT 2>> $TS_ERRLOG $TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT $TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o VFS-OPTIONS >> $TS_OUTPUT $TS_CMD_UMOUNT $MOUNTPOINT diff --git a/tests/ts/mount/umount-alltargets b/tests/ts/mount/umount-alltargets index 69799de77e..4f2a0f1b57 100755 --- a/tests/ts/mount/umount-alltargets +++ b/tests/ts/mount/umount-alltargets @@ -70,15 +70,15 @@ function multi_mount() { ts_log "prepare: Mount dev to mnt1" [ -d "${MNT}1" ] || mkdir -p ${MNT}1 - $TS_CMD_MOUNT $DEV ${MNT}1 >> $TS_OUTPUT 2>&1 + $TS_CMD_MOUNT $DEV ${MNT}1 >> $TS_OUTPUT 2>> $TS_ERRLOG ts_log "prepare: Mount dev to mnt2" [ -d "${MNT}2" ] || mkdir -p ${MNT}2 - $TS_CMD_MOUNT $DEV ${MNT}2 >> $TS_OUTPUT 2>&1 + $TS_CMD_MOUNT $DEV ${MNT}2 >> $TS_OUTPUT 2>> $TS_ERRLOG ts_log "prepare: Mount /dev/xxx1 to mnt3" [ -d "${MNT}3" ] || mkdir -p ${MNT}3 - $TS_CMD_MOUNT $DEV ${MNT}3 >> $TS_OUTPUT 2>&1 + $TS_CMD_MOUNT $DEV ${MNT}3 >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle } @@ -91,7 +91,7 @@ MOUNTPOINT=$TS_MOUNTPOINT # ts_init_subtest "all-targets-mnt" multi_mount ${TS_DEVICE}1 $MOUNTPOINT -$TS_CMD_UMOUNT --all-targets ${MOUNTPOINT}1 >> $TS_OUTPUT 2>&1 +$TS_CMD_UMOUNT --all-targets ${MOUNTPOINT}1 >> $TS_OUTPUT 2>> $TS_ERRLOG [ $? == 0 ] || ts_log "umount failed" ts_finalize_subtest @@ -100,7 +100,7 @@ ts_finalize_subtest # ts_init_subtest "all-targets-dev" multi_mount ${TS_DEVICE}1 $MOUNTPOINT -$TS_CMD_UMOUNT --all-targets ${TS_DEVICE}1 >> $TS_OUTPUT 2>&1 +$TS_CMD_UMOUNT --all-targets ${TS_DEVICE}1 >> $TS_OUTPUT 2>> $TS_ERRLOG [ $? == 0 ] || ts_log "umount failed" ts_finalize_subtest @@ -116,7 +116,7 @@ $TS_CMD_MOUNT ${TS_DEVICE}2 ${MOUNTPOINT}1/subA $TS_CMD_MOUNT ${TS_DEVICE}3 ${MOUNTPOINT}1/subA/subAB [ -d "${MOUNTPOINT}1/subB" ] || mkdir -p ${MOUNTPOINT}1/subB $TS_CMD_MOUNT ${TS_DEVICE}4 ${MOUNTPOINT}1/subB -$TS_CMD_UMOUNT --recursive --all-targets ${TS_DEVICE}1 >> $TS_OUTPUT 2>&1 +$TS_CMD_UMOUNT --recursive --all-targets ${TS_DEVICE}1 >> $TS_OUTPUT 2>> $TS_ERRLOG [ $? == 0 ] || ts_log "umount failed" ts_finalize_subtest diff --git a/tests/ts/mount/umount-recursive b/tests/ts/mount/umount-recursive index 547217e3ae..7857fe3a4d 100755 --- a/tests/ts/mount/umount-recursive +++ b/tests/ts/mount/umount-recursive @@ -65,30 +65,30 @@ ts_log "Do tests..." [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT ts_log "A) Mount root" -$TS_CMD_MOUNT ${TS_DEVICE}1 $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT ${TS_DEVICE}1 $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG $TS_CMD_MOUNT --make-shared $TS_MOUNTPOINT ts_log "B) Mount child" mkdir -p $TS_MOUNTPOINT/mntB -$TS_CMD_MOUNT ${TS_DEVICE}2 $TS_MOUNTPOINT/mntB >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT ${TS_DEVICE}2 $TS_MOUNTPOINT/mntB >> $TS_OUTPUT 2>> $TS_ERRLOG ts_log "B2) Mount child-bind" mkdir -p $TS_MOUNTPOINT/bindB -$TS_CMD_MOUNT --bind $TS_MOUNTPOINT/mntB $TS_MOUNTPOINT/bindB >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT --bind $TS_MOUNTPOINT/mntB $TS_MOUNTPOINT/bindB >> $TS_OUTPUT 2>> $TS_ERRLOG ts_log "C) Mount child/child" mkdir -p $TS_MOUNTPOINT/mntB/mnt{C,D} -$TS_CMD_MOUNT ${TS_DEVICE}3 $TS_MOUNTPOINT/mntB/mntC >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT ${TS_DEVICE}3 $TS_MOUNTPOINT/mntB/mntC >> $TS_OUTPUT 2>> $TS_ERRLOG ts_log "D) Mount child/child" -$TS_CMD_MOUNT ${TS_DEVICE}4 $TS_MOUNTPOINT/mntB/mntD >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT ${TS_DEVICE}4 $TS_MOUNTPOINT/mntB/mntD >> $TS_OUTPUT 2>> $TS_ERRLOG ts_log "E) Mount child-bind" mkdir -p $TS_MOUNTPOINT/bindC $TS_CMD_MOUNT --bind $TS_MOUNTPOINT/mntB/mntC $TS_MOUNTPOINT/bindC udevadm settle -$TS_CMD_UMOUNT --recursive $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_UMOUNT --recursive $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG [ $? == 0 ] || ts_die "umount failed" ts_log "Success" diff --git a/tests/ts/mount/uuid b/tests/ts/mount/uuid index 36f75cef9b..7b106a0bd0 100755 --- a/tests/ts/mount/uuid +++ b/tests/ts/mount/uuid @@ -38,12 +38,12 @@ UUID=$(ts_uuid_by_devname "$DEVICE") || ts_die "Cannot find UUID on $DEVICE" ts_udevadm_settle "$DEVICE" "UUID" # variant A) -$TS_CMD_MOUNT -U $UUID $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT -U $UUID $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" # variant B) -$TS_CMD_MOUNT UUID=$UUID $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 +$TS_CMD_MOUNT UUID=$UUID $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" diff --git a/tests/ts/namei/logic b/tests/ts/namei/logic index e0241103b0..d6029494a9 100755 --- a/tests/ts/namei/logic +++ b/tests/ts/namei/logic @@ -28,8 +28,8 @@ ts_cd "$TS_OUTDIR" mkdir -p namei1/namei2 touch namei1/namei2/a namei1/namei2/b -$TS_CMD_NAMEI namei1/namei2/a >> $TS_OUTPUT 2>&1 -$TS_CMD_NAMEI namei1/namei2/b >> $TS_OUTPUT 2>&1 +$TS_CMD_NAMEI namei1/namei2/a >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_NAMEI namei1/namei2/b >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize diff --git a/tests/ts/partx/partx b/tests/ts/partx/partx index 84c286a947..67f35f5469 100755 --- a/tests/ts/partx/partx +++ b/tests/ts/partx/partx @@ -56,7 +56,7 @@ ts_init_subtest "addpart" echo OK || echo "Unable to add partition" check_partition_count 1 -} >$TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest udevadm settle @@ -67,7 +67,7 @@ ts_init_subtest "delpart" echo OK || echo "Unable to remove partition" check_partition_count 0 -} >$TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_scsi_debug_rmmod @@ -81,7 +81,7 @@ ts_init_subtest "detect-parts" echo OK || echo "Unable to list partitions" check_partition_count $PARTS -} >$TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest udevadm settle @@ -93,7 +93,7 @@ ts_init_subtest "delete-all" echo "partitions deleted" || echo "Unable to delete partitions on $TS_DEVICE" check_partition_count 0 -} >$TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest udevadm settle @@ -105,7 +105,7 @@ ts_init_subtest "add-all" echo "partitions added" || echo "Unable to add partitions for $TS_DEVICE" check_partition_count $PARTS -} >$TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest udevadm settle @@ -117,7 +117,7 @@ ts_init_subtest "update-one" echo "partitions updated" || echo "Unable to update 2nd partition for $TS_DEVICE" check_partition_count $PARTS -} >$TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest udevadm settle @@ -129,7 +129,7 @@ ts_init_subtest "delete-one" echo "last partition removed" || echo "Unable to remove a partition on $TS_DEVICE" check_partition_count $((PARTS-1)) -} >$TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest udevadm settle @@ -145,7 +145,7 @@ ts_init_subtest "delete-non-existent" $TS_CMD_PARTX -d --nr $PARTS $TS_DEVICE && echo "partx: OK" || echo "partx failed: removed non-existing partition" -} >$TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest udevadm settle @@ -156,7 +156,7 @@ ts_init_subtest "add-existing" $TS_CMD_PARTX -a --nr 1 $TS_DEVICE 2>/dev/null && echo "partx failed: re-added an existing partition" || echo "partx: OK" -} >$TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest udevadm settle @@ -172,7 +172,7 @@ ts_init_subtest "change-by-range" echo "partitions added" || echo "Failed to add $TS_DEVICE partitions" check_partition_count $PARTS -} >$TS_OUTPUT 2>&1 +} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest ts_finalize diff --git a/tests/ts/partx/partx-image b/tests/ts/partx/partx-image index 73c7ba155d..c7f471e51d 100755 --- a/tests/ts/partx/partx-image +++ b/tests/ts/partx/partx-image @@ -36,7 +36,7 @@ for img in $TS_IMGDIR/*.img.xz; do xz -dc $img > $outimg && $TS_CMD_PARTX $outimg || echo "failed: $?" - } >$TS_OUTPUT 2>&1 + } >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest done diff --git a/tests/ts/rename/basic b/tests/ts/rename/basic index cf3629e357..60e1717091 100755 --- a/tests/ts/rename/basic +++ b/tests/ts/rename/basic @@ -25,7 +25,7 @@ ts_check_test_command "$TS_CMD_RENAME" ts_cd "$TS_OUTDIR" touch rename_basic.{1..3} -$TS_CMD_RENAME -v basic test rename_basic.? >> $TS_OUTPUT 2>&1 +$TS_CMD_RENAME -v basic test rename_basic.? >> $TS_OUTPUT 2>> $TS_ERRLOG for i in rename_basic.?; do echo "what is $i doing here?" >> $TS_OUTPUT diff --git a/tests/ts/rename/exit_codes b/tests/ts/rename/exit_codes index 5f8438f27c..c7810bb342 100755 --- a/tests/ts/rename/exit_codes +++ b/tests/ts/rename/exit_codes @@ -26,14 +26,14 @@ ts_check_test_command "$TS_CMD_RENAME" ts_cd "$TS_OUTDIR" touch rename_exit_codes.{1..2} -$TS_CMD_RENAME -v not_a_match impossible rename_exit_codes.? >> $TS_OUTPUT 2>&1 +$TS_CMD_RENAME -v not_a_match impossible rename_exit_codes.? >> $TS_OUTPUT 2>> $TS_ERRLOG echo "RENAME_EXIT_NOTHING: $?" >> $TS_OUTPUT -$TS_CMD_RENAME -v codes values rename_exit_codes.? >> $TS_OUTPUT 2>&1 +$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>&1 +ts_run --unbuffered $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 diff --git a/tests/ts/rename/overwrite b/tests/ts/rename/overwrite index be5b24d03b..b6a633a38b 100755 --- a/tests/ts/rename/overwrite +++ b/tests/ts/rename/overwrite @@ -25,7 +25,7 @@ ts_check_test_command "$TS_CMD_RENAME" ts_cd "$TS_OUTDIR" touch rename_from rename_to -$TS_CMD_RENAME -v --no-overwrite from to rename_from > $TS_OUTPUT 2>&1 -rm rename_from rename_to >> $TS_OUTPUT 2>&1 +$TS_CMD_RENAME -v --no-overwrite from to rename_from >> $TS_OUTPUT 2>> $TS_ERRLOG +rm rename_from rename_to >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize diff --git a/tests/ts/rename/subdir b/tests/ts/rename/subdir index 01472fa145..192c2ff051 100755 --- a/tests/ts/rename/subdir +++ b/tests/ts/rename/subdir @@ -27,40 +27,40 @@ ts_cd "$TS_OUTDIR" echo "== files ==" >> $TS_OUTPUT mkdir rename_a{a,b} touch rename_a{a,b}/aa -$TS_CMD_RENAME -v a x rename_a?/aa >> $TS_OUTPUT 2>&1 -find rename_a{a,b} >> $TS_OUTPUT 2>&1 +$TS_CMD_RENAME -v a x rename_a?/aa >> $TS_OUTPUT 2>> $TS_ERRLOG +find rename_a{a,b} >> $TS_OUTPUT 2>> $TS_ERRLOG echo "== symlinks ==" >> $TS_OUTPUT for i in rename_a{a,b}/sublink.{1..3}; do ln -s rename/aa $i done -$TS_CMD_RENAME -s -v a x rename_a{a,b}/sublink.? >> $TS_OUTPUT 2>&1 +$TS_CMD_RENAME -s -v a x rename_a{a,b}/sublink.? >> $TS_OUTPUT 2>> $TS_ERRLOG for i in rename_a{a,b}/sublink.?; do - readlink $i >> $TS_OUTPUT 2>&1 + readlink $i >> $TS_OUTPUT 2>> $TS_ERRLOG done rm -rf rename_a{a,b} echo "== fullpath ==" >> $TS_OUTPUT touch rename_path1 -$TS_CMD_RENAME -v ./rename_path1 ./rename_path2 ./rename_path1 >> $TS_OUTPUT 2>&1 +$TS_CMD_RENAME -v ./rename_path1 ./rename_path2 ./rename_path1 >> $TS_OUTPUT 2>> $TS_ERRLOG -find . -name 'rename_path*' >> $TS_OUTPUT 2>&1 +find . -name 'rename_path*' >> $TS_OUTPUT 2>> $TS_ERRLOG rm -f ./rename_path* mkdir rename_path_a touch rename_path_test1 -$TS_CMD_RENAME -v rename_path_test1 rename_path_a/test1 rename_path_test1 >> $TS_OUTPUT 2>&1 +$TS_CMD_RENAME -v rename_path_test1 rename_path_a/test1 rename_path_test1 >> $TS_OUTPUT 2>> $TS_ERRLOG -find . -name '*test1*' >> $TS_OUTPUT 2>&1 +find . -name '*test1*' >> $TS_OUTPUT 2>> $TS_ERRLOG rm -f rename_path_test1 rename_path_a/test1 mkdir rename_path_b touch rename_path_a/test2 -$TS_CMD_RENAME -v rename_path_a/test2 rename_path_b/test2 rename_path_a/test2 >> $TS_OUTPUT 2>&1 +$TS_CMD_RENAME -v rename_path_a/test2 rename_path_b/test2 rename_path_a/test2 >> $TS_OUTPUT 2>> $TS_ERRLOG -find rename_path_a rename_path_b >> $TS_OUTPUT 2>&1 +find rename_path_a rename_path_b >> $TS_OUTPUT 2>> $TS_ERRLOG rm -f rename_path_a/test2 rename_path_b/test2 rmdir rename_path_a rename_path_b diff --git a/tests/ts/rename/symlink b/tests/ts/rename/symlink index 67f4392a07..641dc8a5c1 100755 --- a/tests/ts/rename/symlink +++ b/tests/ts/rename/symlink @@ -28,7 +28,7 @@ for i in rename_slink.{1..3}; do ln -s old $i done -$TS_CMD_RENAME -s -v old new rename_slink.? >> $TS_OUTPUT 2>&1 +$TS_CMD_RENAME -s -v old new rename_slink.? >> $TS_OUTPUT 2>> $TS_ERRLOG for i in rename_slink.{1..3}; do where="$(readlink $i)" diff --git a/tests/ts/schedutils/chrt b/tests/ts/schedutils/chrt index 333e12d76c..b16adbde2c 100755 --- a/tests/ts/schedutils/chrt +++ b/tests/ts/schedutils/chrt @@ -26,7 +26,7 @@ ts_skip_nonroot TS_KNOWN_FAIL="yes" function do_chrt { - $TS_CMD_CHRT $* $TS_CMD_CHRT --pid 0 | sed 's/.* policy: //; s/.* priority: //' >> $TS_OUTPUT 2>&1 + $TS_CMD_CHRT $* $TS_CMD_CHRT --pid 0 | sed 's/.* policy: //; s/.* priority: //' >> $TS_OUTPUT 2>> $TS_ERRLOG } function skip_policy { diff --git a/tests/ts/schedutils/chrt-non-root b/tests/ts/schedutils/chrt-non-root index b120d30b26..e542fc34f4 100755 --- a/tests/ts/schedutils/chrt-non-root +++ b/tests/ts/schedutils/chrt-non-root @@ -25,7 +25,7 @@ ts_check_test_command "$TS_CMD_CHRT" TS_KNOWN_FAIL="yes" function do_chrt { - $TS_CMD_CHRT $* $TS_CMD_CHRT --pid 0 | sed 's/.* policy: //; s/.* priority: //' >> $TS_OUTPUT 2>&1 + $TS_CMD_CHRT $* $TS_CMD_CHRT --pid 0 | sed 's/.* policy: //; s/.* priority: //' >> $TS_OUTPUT 2>> $TS_ERRLOG } function skip_policy { @@ -45,7 +45,7 @@ function cleanup_output { ts_init_subtest "batch-vs-nice" skip_policy SCHED_BATCH if [ $? == 0 ]; then - renice -n 5 -p $$ >> $TS_OUTPUT 2>&1 + renice -n 5 -p $$ >> $TS_OUTPUT 2>> $TS_ERRLOG do_chrt --batch 0 cleanup_output ts_finalize_subtest diff --git a/tests/ts/script/replay b/tests/ts/script/replay index 06574c0507..bd46b22fbd 100755 --- a/tests/ts/script/replay +++ b/tests/ts/script/replay @@ -26,12 +26,12 @@ TIMING_FILE="$(mktemp "${TS_OUTDIR}/tmXXXXXXXXXXXXX")" echo "record script output with timing" >"$TS_OUTPUT" "$TS_CMD_SCRIPT" -c "echo hello world; sleep 0.5; echo all done" \ - --timing="$TIMING_FILE" "$SCRIPT_FILE" >>"$TS_OUTPUT" 2>&1 + --timing="$TIMING_FILE" "$SCRIPT_FILE" >> $TS_OUTPUT 2>> $TS_ERRLOG echo "replay script output" >>"$TS_OUTPUT" -"$TS_CMD_SCRIPTREPLAY" "$TIMING_FILE" "$SCRIPT_FILE" 1.5 >>"$TS_OUTPUT" 2>&1 +"$TS_CMD_SCRIPTREPLAY" "$TIMING_FILE" "$SCRIPT_FILE" 1.5 >> $TS_OUTPUT 2>> $TS_ERRLOG -sed -i "s|$SCRIPT_FILE|typescript|g; s|$TIMING_FILE|timingfile|g" "$TS_OUTPUT" +sed -i "s|$SCRIPT_FILE|typescript|g; s|$TIMING_FILE|timingfile|g" $TS_OUTPUT $TS_ERRLOG rm -f "$SCRIPT_FILE" "$TIMING_FILE" diff --git a/tests/ts/sfdisk/dos b/tests/ts/sfdisk/dos index 7d8cfbe092..ba405b3f36 100755 --- a/tests/ts/sfdisk/dos +++ b/tests/ts/sfdisk/dos @@ -31,7 +31,7 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3 ts_init_subtest "simple-commas" -$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --unit S --list ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --activate ${TS_DEVICE} 1 >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --unit S --list ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest @@ -55,7 +55,7 @@ ts_finalize_subtest ts_init_subtest "simple-space" $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null udevadm settle -$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG < /dev/null udevadm settle -$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG < /dev/null udevadm settle -$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --unit S --dump ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE ts_finalize_subtest ts_init_subtest "write-json" -$TS_CMD_SFDISK --json ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --json ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE ts_finalize_subtest @@ -117,7 +117,7 @@ ts_finalize_subtest ts_init_subtest "explicit-size" $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null udevadm settle -$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>&1 +echo ',+' | $TS_CMD_SFDISK --no-reread -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest @@ -155,7 +155,7 @@ label: dos ,2M,E EOF udevadm settle -echo ',+' | $TS_CMD_SFDISK --no-reread -N2 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo ',+' | $TS_CMD_SFDISK --no-reread -N2 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest @@ -170,7 +170,7 @@ label: dos ,5M,E EOF udevadm settle -echo ',-2M' | $TS_CMD_SFDISK --no-reread -N2 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo ',-2M' | $TS_CMD_SFDISK --no-reread -N2 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest @@ -188,7 +188,7 @@ label: dos ,1M EOF udevadm settle -echo ',+' | $TS_CMD_SFDISK --no-reread -N4 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo ',+' | $TS_CMD_SFDISK --no-reread -N4 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest @@ -207,7 +207,7 @@ label: dos ,1M EOF udevadm settle -echo ',+' | $TS_CMD_SFDISK --no-reread -N6 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo ',+' | $TS_CMD_SFDISK --no-reread -N6 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest @@ -216,7 +216,7 @@ ts_finalize_subtest ts_init_subtest "dump-old" $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null udevadm settle -$TS_CMD_SFDISK ${TS_DEVICE} < $TS_SELF/files/dump-old >> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK ${TS_DEVICE} < $TS_SELF/files/dump-old >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_fdisk_clean $TS_DEVICE udevadm settle @@ -226,7 +226,7 @@ ts_finalize_subtest ts_init_subtest "dump-gaps" $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null udevadm settle -$TS_CMD_SFDISK ${TS_DEVICE} < $TS_SELF/files/dump-gaps >> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK ${TS_DEVICE} < $TS_SELF/files/dump-gaps >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_fdisk_clean $TS_DEVICE udevadm settle diff --git a/tests/ts/sfdisk/gpt b/tests/ts/sfdisk/gpt index e9c8d3e226..072643375f 100755 --- a/tests/ts/sfdisk/gpt +++ b/tests/ts/sfdisk/gpt @@ -32,7 +32,7 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3 ts_init_subtest "all-defaults" -$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG < /dev/null $TS_CMD_SFDISK --part-uuid ${TS_DEVICE} 5 60155bd7-bfd8-4e8c-b800-221900779373 &> /dev/null -$TS_CMD_SFDISK --part-uuid ${TS_DEVICE} 1 >> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --part-uuid ${TS_DEVICE} 1 >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest ts_init_subtest "label" -$TS_CMD_SFDISK --part-label ${TS_DEVICE} 1 "EFI system" >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --part-label ${TS_DEVICE} 1 >> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --part-label ${TS_DEVICE} 1 "EFI system" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --part-label ${TS_DEVICE} 1 >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest ts_init_subtest "type" -$TS_CMD_SFDISK --part-type ${TS_DEVICE} 1 "C12A7328-F81F-11D2-BA4B-00A0C93EC93B" >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --part-type ${TS_DEVICE} 1 >> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --part-type ${TS_DEVICE} 1 "C12A7328-F81F-11D2-BA4B-00A0C93EC93B" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --part-type ${TS_DEVICE} 1 >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest ts_init_subtest "attrs" -$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "RequiredPartition,NoBlockIOProtocol,48,51" >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 >> $TS_OUTPUT 2>&1 -echo -e 'x\nD\n' | $TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "RequiredPartition,NoBlockIOProtocol,48,51" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 >> $TS_OUTPUT 2>> $TS_ERRLOG +echo -ne 'x\nD\n' | $TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest ts_init_subtest "attrs-space" -$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "RequiredPartition NoBlockIOProtocol 48 51" >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 >> $TS_OUTPUT 2>&1 -echo -e 'x\nD\n' | $TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "RequiredPartition NoBlockIOProtocol 48 51" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 >> $TS_OUTPUT 2>> $TS_ERRLOG +echo -ne 'x\nD\n' | $TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest ts_init_subtest "attrs-guid" -$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "GUID:48 GUID:51,52,63" >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 >> $TS_OUTPUT 2>&1 -echo -e 'x\nD\n' | $TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "GUID:48 GUID:51,52,63" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 >> $TS_OUTPUT 2>> $TS_ERRLOG +echo -ne 'x\nD\n' | $TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest ts_init_subtest "attrs-with-typo" -$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "RequiredPartiton,NoBlockIOProtocol,48,51" >> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 >> $TS_OUTPUT 2>&1 -echo -e 'x\nD\n' | $TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "RequiredPartiton,NoBlockIOProtocol,48,51" >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 >> $TS_OUTPUT 2>> $TS_ERRLOG +echo -ne 'x\nD\n' | $TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest ts_init_subtest "attrs-unsupported" -$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "NoBlockIOProtocol FooBar 48 51" >> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "NoBlockIOProtocol FooBar 48 51" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE ts_finalize_subtest ts_init_subtest "attrs-broken-nosep" -$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "NoBlockIOProtocolRequiredPartiton" >> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "NoBlockIOProtocolRequiredPartiton" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE ts_finalize_subtest ts_init_subtest "attrs-broken-guid" -$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "GUID:NoBlockIOProtocol GUID:GUID:63 RequiredPartiton" >> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --part-attrs ${TS_DEVICE} 2 "GUID:NoBlockIOProtocol GUID:GUID:63 RequiredPartiton" >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE ts_finalize_subtest @@ -133,7 +133,7 @@ ts_finalize_subtest ts_init_subtest "read-dump" $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null udevadm settle -$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE ts_finalize_subtest ts_init_subtest "write-dump" -$TS_CMD_SFDISK --unit S --dump ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --unit S --dump ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE ts_finalize_subtest ts_init_subtest "write-json" -$TS_CMD_SFDISK --json ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --json ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE ts_finalize_subtest ts_init_subtest "list-pmbr" -$TS_CMD_SFDISK --list --label-nested dos ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --list --label-nested dos ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE ts_finalize_subtest @@ -175,7 +175,7 @@ label: gpt ,10M,S,* EOF udevadm settle -echo ',+' | $TS_CMD_SFDISK --no-reread -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo ',+' | $TS_CMD_SFDISK --no-reread -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest @@ -184,7 +184,7 @@ ts_finalize_subtest ts_init_subtest "reorder" $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null udevadm settle -$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>&1 -$TS_CMD_SFDISK --list ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --reorder ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_SFDISK --list ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest diff --git a/tests/ts/sfdisk/movedata b/tests/ts/sfdisk/movedata index 299d6cce80..239c82867a 100755 --- a/tests/ts/sfdisk/movedata +++ b/tests/ts/sfdisk/movedata @@ -47,7 +47,7 @@ function checksum() { } ts_init_subtest "up" -echo '+1000,' | $TS_CMD_SFDISK --no-reread --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo '+1000,' | $TS_CMD_SFDISK --no-reread --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle checksum ${TS_DEVICE}1 @@ -56,7 +56,7 @@ ts_finalize_subtest udevadm settle ts_init_subtest "down" -echo "-500," | $TS_CMD_SFDISK --no-reread --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo "-500," | $TS_CMD_SFDISK --no-reread --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle checksum ${TS_DEVICE}1 @@ -65,7 +65,7 @@ ts_finalize_subtest udevadm settle ts_init_subtest "non-overlay" -echo "+30M," | $TS_CMD_SFDISK --no-reread --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo "+30M," | $TS_CMD_SFDISK --no-reread --move-data=$TS_OUTPUT.log -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle checksum ${TS_DEVICE}1 diff --git a/tests/ts/sfdisk/resize b/tests/ts/sfdisk/resize index 4b2ad4f53f..fa11373c62 100755 --- a/tests/ts/sfdisk/resize +++ b/tests/ts/sfdisk/resize @@ -85,7 +85,7 @@ function test_label_resize { ts_init_subtest "$label-$idx-$name" echo -e "$cmd\n" >> $TS_OUTPUT - echo "$cmd" | $TS_CMD_SFDISK --no-reread -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 + echo "$cmd" | $TS_CMD_SFDISK --no-reread -N1 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest @@ -101,7 +101,7 @@ function test_label_resize { ts_init_subtest "$label-$idx-reduce-midle" cmd=',-5M' echo -e "$cmd\n" >> $TS_OUTPUT - echo "$cmd" | $TS_CMD_SFDISK --no-reread -N2 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 + echo "$cmd" | $TS_CMD_SFDISK --no-reread -N2 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest @@ -110,7 +110,7 @@ function test_label_resize { ts_init_subtest "$label-$idx-max-last" cmd='-5M,+' echo -e "$cmd\n" >> $TS_OUTPUT - echo $cmd | $TS_CMD_SFDISK --no-reread -N3 ${TS_DEVICE} >> $TS_OUTPUT 2>&1 + echo $cmd | $TS_CMD_SFDISK --no-reread -N3 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest @@ -131,7 +131,7 @@ ts_init_subtest "dos-unsorted" # and there is freespace at the end of the disk. Note that #4 is not the last # partno on the disk. The libfdisk has to be able to check for the free space # independently on the partno, only offset+size matters. -$TS_CMD_SFDISK --no-reread ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>&1 +echo ',+,' | $TS_CMD_SFDISK --no-reread -N 4 ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_finalize_subtest diff --git a/tests/ts/sfdisk/script b/tests/ts/sfdisk/script index d63bc771f7..43655958f8 100755 --- a/tests/ts/sfdisk/script +++ b/tests/ts/sfdisk/script @@ -16,7 +16,7 @@ TS_TOPDIR="${0%/*}/../.." -TS_DESC="GPT" +TS_DESC="script" . $TS_TOPDIR/functions.sh ts_init "$*" @@ -33,7 +33,7 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3 ts_init_subtest "type-and-id" $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null udevadm settle -$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE ts_finalize_subtest ts_init_subtest "separator" $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null udevadm settle -$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE ts_finalize_subtest @@ -70,7 +70,7 @@ ts_finalize_subtest ts_init_subtest "quotes" $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null udevadm settle -$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>&1 +$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE ts_finalize_subtest @@ -89,7 +89,7 @@ ts_finalize_subtest ts_init_subtest "broken-1" $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null udevadm settle -$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG < /dev/null udevadm settle -$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG < /dev/null udevadm settle -$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG < /dev/null udevadm settle -$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG < /dev/null udevadm settle -$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>&1 +echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --label=gpt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_separator "Create DOS" -echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --wipe=always --label=dos ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --wipe=always --label=dos ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_separator "Check content" -$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest @@ -50,14 +50,14 @@ ts_finalize_subtest # ts_init_subtest "gpt-to-dos-auto" ts_separator "Create GPT" -echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --label=gpt ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --label=gpt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_separator "Create DOS" -echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --label=dos ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --label=dos ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_separator "Check content" -$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest @@ -68,11 +68,11 @@ udevadm settle $TS_CMD_MKSWAP ${TS_DEVICE} &> /dev/null udevadm settle ts_separator "Create DOS" -echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --wipe=always --label=dos ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --wipe=always --label=dos ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE udevadm settle ts_separator "Check content" -$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize_subtest @@ -80,7 +80,7 @@ ts_init_subtest "partition" ts_separator "Create GPT" $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null udevadm settle -echo ',,L' | $TS_CMD_SFDISK --no-reread --label=gpt ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo ',,L' | $TS_CMD_SFDISK --no-reread --label=gpt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_separator "Create FS in partition" $TS_CMD_MKSWAP ${TS_DEVICE}1 &> /dev/null @@ -89,13 +89,13 @@ ts_separator "Wipe whole-disk device" $TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null udevadm settle ts_separator "Create GPT (again)" -echo ',,L' | $TS_CMD_SFDISK --no-reread --wipe-partition=always --label=gpt ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +echo ',,L' | $TS_CMD_SFDISK --no-reread --wipe-partition=always --label=gpt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_separator "Check content (disk)" -$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle ts_separator "Check content (partition)" -$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE}1 >> $TS_OUTPUT 2>&1 +$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE}1 >> $TS_OUTPUT 2>> $TS_ERRLOG ts_fdisk_clean $TS_DEVICE ts_finalize_subtest diff --git a/tests/ts/swapon/devname b/tests/ts/swapon/devname index 7469dcb180..9972f6c308 100755 --- a/tests/ts/swapon/devname +++ b/tests/ts/swapon/devname @@ -36,7 +36,7 @@ $TS_CMD_MKSWAP $DEVICE > /dev/null 2>> $TS_OUTPUT \ ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE" -$TS_CMD_SWAPON $DEVICE >> $TS_OUTPUT 2>&1 +$TS_CMD_SWAPON $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG grep -q "^$DEVICE\b" /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" diff --git a/tests/ts/swapon/label b/tests/ts/swapon/label index 1bb5dbb3ec..1a4c638b02 100755 --- a/tests/ts/swapon/label +++ b/tests/ts/swapon/label @@ -38,7 +38,7 @@ ts_device_has "LABEL" $LABEL $DEVICE \ || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" ts_udevadm_settle "$DEVICE" "LABEL" -$TS_CMD_SWAPON -L $LABEL >> $TS_OUTPUT 2>&1 +$TS_CMD_SWAPON -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG grep -q "^$DEVICE\b" /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" diff --git a/tests/ts/swapon/uuid b/tests/ts/swapon/uuid index 70e62d7f91..7e3d1dc94e 100755 --- a/tests/ts/swapon/uuid +++ b/tests/ts/swapon/uuid @@ -36,7 +36,7 @@ $TS_CMD_MKSWAP $DEVICE > /dev/null 2>> $TS_OUTPUT \ UUID=$(ts_uuid_by_devname "$DEVICE") || ts_die "Cannot find UUID on $DEVICE" ts_udevadm_settle "$DEVICE" "UUID" -$TS_CMD_SWAPON -U $UUID >> $TS_OUTPUT 2>&1 +$TS_CMD_SWAPON -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG grep -q "^$DEVICE\b" /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" diff --git a/tests/ts/utmp/utmpdump-circle b/tests/ts/utmp/utmpdump-circle index 0065f705b4..f171eae04e 100755 --- a/tests/ts/utmp/utmpdump-circle +++ b/tests/ts/utmp/utmpdump-circle @@ -41,7 +41,7 @@ for f in txt-a txt-b txt-ipv6; do $TS_CMD_UTMPDUMP -r $OUT_TXT > $OUT_BIN2 2>/dev/null && diff -q $OUT_BIN1 $OUT_BIN2 || echo "circle failed for $f" -done >> $TS_OUTPUT 2>&1 +done >> $TS_OUTPUT 2>> $TS_ERRLOG rm -f "$OUT_BIN1" "$OUT_BIN2" "$OUT_TXT" diff --git a/tests/ts/utmp/utmpdump-tobin b/tests/ts/utmp/utmpdump-tobin index 8b089e6f43..33a8dc400a 100755 --- a/tests/ts/utmp/utmpdump-tobin +++ b/tests/ts/utmp/utmpdump-tobin @@ -27,6 +27,6 @@ OUTFILE=${TS_OUTDIR}/${TS_TESTNAME}.file $TS_CMD_UTMPDUMP -r $TS_SELF/txt-b >| $OUTFILE 2>/dev/null if diff -q $TS_SELF/wtmp-b.$BYTE_ORDER $OUTFILE; then echo "no diff" -fi > $TS_OUTPUT 2>&1 +fi >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize diff --git a/tests/ts/utmp/utmpdump-tobin-ipv6 b/tests/ts/utmp/utmpdump-tobin-ipv6 index cd081398e8..aab396a129 100755 --- a/tests/ts/utmp/utmpdump-tobin-ipv6 +++ b/tests/ts/utmp/utmpdump-tobin-ipv6 @@ -27,6 +27,6 @@ OUTFILE=${TS_OUTDIR}/${TS_TESTNAME}.file $TS_CMD_UTMPDUMP -r $TS_SELF/txt-ipv6 >| $OUTFILE 2>/dev/null if diff -q $TS_SELF/wtmp-ipv6.$BYTE_ORDER $OUTFILE; then echo "no diff" -fi > $TS_OUTPUT 2>&1 +fi >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize diff --git a/tests/ts/uuid/uuid_parser b/tests/ts/uuid/uuid_parser index d80d26951b..6c085b7d3c 100755 --- a/tests/ts/uuid/uuid_parser +++ b/tests/ts/uuid/uuid_parser @@ -20,7 +20,7 @@ ts_init "$*" ts_check_test_command "$TS_HELPER_UUID_PARSER" -$TS_HELPER_UUID_PARSER > $TS_OUTPUT 2>&1 +$TS_HELPER_UUID_PARSER >> $TS_OUTPUT 2>> $TS_ERRLOG echo "return value: $?" >> $TS_OUTPUT ts_finalize diff --git a/tests/ts/uuid/uuidd b/tests/ts/uuid/uuidd index 16dc45e3fd..a38996c851 100755 --- a/tests/ts/uuid/uuidd +++ b/tests/ts/uuid/uuidd @@ -35,11 +35,11 @@ test_flag() { echo "options: $*" >> $TS_OUTPUT $TS_CMD_UUIDD -s $UUIDD_SOCKET $* | sed '/List of UUIDs:/d; s/^[[:space:]]*//' > "$OUTPUT_FILE" 2>>$TS_OUTPUT - $TS_HELPER_UUID_PARSER "$OUTPUT_FILE" >> $TS_OUTPUT 2>&1 + $TS_HELPER_UUID_PARSER "$OUTPUT_FILE" >> $TS_OUTPUT 2>> $TS_ERRLOG ret=$? if [ $ret -ne 0 ]; then echo "something wrong with $OUTPUT_FILE" >> $TS_OUTPUT - cat $OUTPUT_FILE >> $TS_OUTPUT 2>&1 + cat $OUTPUT_FILE >> $TS_OUTPUT 2>> $TS_ERRLOG fi echo "return value: $ret" >> $TS_OUTPUT } @@ -50,8 +50,9 @@ test_flag -r test_flag --random test_flag -r -n 65 -$TS_CMD_UUIDD -k -s "$UUIDD_SOCKET" 2>&1 | - sed 's/pid [0-9]*.$/pid ./' >> "$TS_OUTPUT" +$TS_CMD_UUIDD -k -s "$UUIDD_SOCKET" >> $TS_OUTPUT 2>> $TS_ERRLOG + +sed -i 's/pid [0-9]*.$/pid ./' $TS_OUTPUT $TS_ERRLOG rm -f "$OUTPUT_FILE" "$UUIDD_PID" "$UUIDD_SOCKET" diff --git a/tests/ts/uuid/uuidgen b/tests/ts/uuid/uuidgen index 6aa1b5b216..30058b470b 100755 --- a/tests/ts/uuid/uuidgen +++ b/tests/ts/uuid/uuidgen @@ -27,10 +27,10 @@ test_flag() { echo "option: $1" >> $TS_OUTPUT $TS_CMD_UUIDGEN $1 > "$OUTPUT_FILE" 2>>$TS_OUTPUT ret=$? - $TS_HELPER_UUID_PARSER "$OUTPUT_FILE" >> $TS_OUTPUT 2>&1 + $TS_HELPER_UUID_PARSER "$OUTPUT_FILE" >> $TS_OUTPUT 2>> $TS_ERRLOG if [ $? -ne 0 ] || [ $ret -ne 0 ]; then echo "something wrong with $OUTPUT_FILE" >> $TS_OUTPUT - cat $OUTPUT_FILE >> $TS_OUTPUT 2>&1 + cat $OUTPUT_FILE >> $TS_OUTPUT 2>> $TS_ERRLOG fi echo "return values: $ret and $?" >> $TS_OUTPUT } diff --git a/tests/ts/uuid/uuidparse b/tests/ts/uuid/uuidparse index 2414353f3d..1ec371e76c 100755 --- a/tests/ts/uuid/uuidparse +++ b/tests/ts/uuid/uuidparse @@ -55,7 +55,7 @@ echo '00000000-0000-0000-0000-000000000000 9b274c46-544a-11e7-a972-00037f500001 -invalid-input' | $TS_CMD_UUIDPARSE 1>$TS_OUTPUT 2>&1 +invalid-input' | $TS_CMD_UUIDPARSE >> $TS_OUTPUT 2>> $TS_ERRLOG echo "return value: $?" >> $TS_OUTPUT ts_finalize -- 2.39.2