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
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
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
--- /dev/null
+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
## 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
--- /dev/null
+## 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
## 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
--- /dev/null
+## 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
## 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
--- /dev/null
+## 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
## 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
--- /dev/null
+## 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
## 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
--- /dev/null
+## 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
## 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
--- /dev/null
+## 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
<removed>p1 2048 20446 18399 9M Linux filesystem
The partition table has been altered.
-
-
----- fixing after resize: -----
-
-
Welcome to fdisk <removed>.
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 <removed>.
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 <removed>: 20 MiB, 20971520 bytes, 40960 sectors
Units: sectors of 1 * 512 = 512 bytes
Sector size (logical/physical): 512 bytes / 512 bytes
--- /dev/null
+----- 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
-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
--- /dev/null
+---Nonexistent file
+fdisk: cannot open _a_file_that_does_not_exist_: ENOENT
+---Too small file
+fdisk: cannot open oddinput.toosmall: ENOTTY
[ 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
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_
[ 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
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_
--- /dev/null
+[ 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
--- /dev/null
+[ 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
--- /dev/null
+[ 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
[ 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
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_
-getopt: missing optstring argument
-Try 'getopt --help' for more information.
exit value: 2
--
exit value: 0
--- /dev/null
+getopt: missing optstring argument
+Try 'getopt --help' for more information.
-getopt: invalid option -- 'b'
-Try 'getopt --help' for more information.
exit value: 2
--- /dev/null
+/home/projects/util-linux/util-linux/getopt: invalid option -- 'b'
+Try 'getopt --help' for more information.
-getopt: missing optstring argument
-Try 'getopt --help' for more information.
exit value: 2
--- /dev/null
+getopt: missing optstring argument
+Try 'getopt --help' for more information.
-getopt: option '--long' is ambiguous; possibilities: '--long1' '--long2'
--
exit value: 1
--- /dev/null
+/home/projects/util-linux/util-linux/getopt: option '--long' is ambiguous; possibilities: '--long1' '--long2'
-THIS_PROGRAM: invalid option -- 'b'
-THIS_PROGRAM: unrecognized option '--whatever'
--long -a --
exit value: 1
--- /dev/null
+THIS_PROGRAM: invalid option -- 'b'
+THIS_PROGRAM: unrecognized option '--whatever'
-THIS_PROGRAM: invalid option -- 'b'
-THIS_PROGRAM: unrecognized option '--whatever'
--long -a --
exit value: 1
--- /dev/null
+THIS_PROGRAM: invalid option -- 'b'
+THIS_PROGRAM: unrecognized option '--whatever'
-getopt: missing optstring argument
-Try 'getopt --help' for more information.
exit value: 2
--- /dev/null
+getopt: missing optstring argument
+Try 'getopt --help' for more information.
-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
--- /dev/null
+/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'
-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
--- /dev/null
+/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'
-getopt: invalid option -- 'b'
-getopt: unrecognized option '--whatever'
--long -a --
exit value: 1
--- /dev/null
+/home/projects/util-linux/util-linux/getopt: invalid option -- 'b'
+/home/projects/util-linux/util-linux/getopt: unrecognized option '--whatever'
test 1
-kill: cannot find process "test_sigreceive"
test 2
test 3
-kill: cannot find process "test_sigreceive"
--- /dev/null
+test 1
+kill: cannot find process "test_sigreceive"
+test 2
+test 3
+kill: cannot find process "test_sigreceive"
-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
--- /dev/null
+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 '
-test_logger: unknown priority name: 8
ret: 1
--- /dev/null
+test_logger: unknown priority name: 8
-test_logger: socket /bad/boy: No such file or directory
ret: 1
--- /dev/null
+test_logger: socket /bad/boy: No such file or directory
-<8>Feb 13 23:31:30 prio: message
ret: 0
--- /dev/null
+<8>Feb 13 23:31:30 prio: message
-<8>Feb 13 23:31:30 prio: message
ret: 0
--- /dev/null
+<8>Feb 13 23:31:30 prio: message
-<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
--- /dev/null
+<13>Feb 13 23:31:30 multi: AAA
+<13>Feb 13 23:31:30 multi: BBB
+<13>Feb 13 23:31:30 multi: CCC
-<13>1 2009-02-13T23:31:30.123456+00:00 test-hostname rfc5424_exceed_size - - [timeQuality tzKnown="1" isSynced="0"] abc
ret: 0
--- /dev/null
+<13>1 2009-02-13T23:31:30.123456+00:00 test-hostname rfc5424_exceed_size - - [timeQuality tzKnown="1" isSynced="0"] abc
-test_logger: --msgid cannot contain space
ret: 1
--- /dev/null
+test_logger: --msgid cannot contain space
-<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
--- /dev/null
+<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
-<13>Feb 13 23:31:30 tcp: message
ret: 0
--- /dev/null
+<13>Feb 13 23:31:30 tcp: message
-Check written socket data of all subtests.
-34 <13>Feb 13 23:31:30 octen: message
-ret: 0
--- /dev/null
+34 <13>Feb 13 23:31:30 octen: message
+ret: 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
--- /dev/null
+<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
-<13>Feb 13 23:31:30 test-hostname rfc3164: message
-ret: 0
--- /dev/null
+<13>Feb 13 23:31:30 test-hostname rfc3164: message
+ret: 0
-<13>1 2009-02-13T23:31:30.123456+00:00 test-hostname rfc5424 - MSGID [timeQuality tzKnown="1" isSynced="0"] message
-ret: 0
--- /dev/null
+<13>1 2009-02-13T23:31:30.123456+00:00 test-hostname rfc5424 - MSGID [timeQuality tzKnown="1" isSynced="0"] message
+ret: 0
-<13>1 2009-02-13T23:31:30.123456+00:00 - rfc5424 - - [timeQuality tzKnown="1" isSynced="0"] message
-ret: 0
--- /dev/null
+<13>1 2009-02-13T23:31:30.123456+00:00 - rfc5424 - - [timeQuality tzKnown="1" isSynced="0"] message
+ret: 0
-<13>1 - test-hostname rfc5424 - - - message
-ret: 0
--- /dev/null
+<13>1 - test-hostname rfc5424 - - - message
+ret: 0
-<13>1 2009-02-13T23:31:30.123456+00:00 test-hostname rfc5424 - - [timeQuality tzKnown="1" isSynced="0"] message
-ret: 0
--- /dev/null
+<13>1 2009-02-13T23:31:30.123456+00:00 test-hostname rfc5424 - - [timeQuality tzKnown="1" isSynced="0"] message
+ret: 0
-MESSAGE_ID=b8f74e14bc714bfc8040a5106dc9376a
-MESSAGE=a b c 1 2 3
-ret: 0
--- /dev/null
+MESSAGE_ID=b8f74e14bc714bfc8040a5106dc9376a
+MESSAGE=a b c 1 2 3
+ret: 0
-Check written socket data of all subtests.
-<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
--- /dev/null
+<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
-<66>Feb 13 23:31:30 test_tag: prio_prefix
-ret: 0
--- /dev/null
+<66>Feb 13 23:31:30 test_tag: prio_prefix
+ret: 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
--- /dev/null
+<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
-<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
--- /dev/null
+<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
-<13>Feb 13 23:31:30 test_tag[98765]: test
-ret: 0
--- /dev/null
+<13>Feb 13 23:31:30 test_tag[98765]: test
+ret: 0
-<13>Feb 13 23:31:30 test_tag[12345]: test
-ret: 0
--- /dev/null
+<13>Feb 13 23:31:30 test_tag[12345]: test
+ret: 0
-<13>Feb 13 23:31:30 test_tag[98765]: test
-ret: 0
--- /dev/null
+<13>Feb 13 23:31:30 test_tag[98765]: test
+ret: 0
-<13>Feb 13 23:31:30 test_tag[98765]: test
-ret: 0
--- /dev/null
+<13>Feb 13 23:31:30 test_tag[98765]: test
+ret: 0
-<13>Feb 13 23:31:30 test_tag: test
-ret: 0
--- /dev/null
+<13>Feb 13 23:31:30 test_tag: test
+ret: 0
return fsck: 0
#####################################
$ mkfs.minix -n 60 image
-mkfs.minix: unsupported name length: 60
return mkfs: 8
#####################################
$ mkfs.minix -1 image
return fsck: 0
#####################################
$ mkfs.minix -1 -n 60 image
-mkfs.minix: unsupported name length: 60
return mkfs: 8
#####################################
$ mkfs.minix -2 image
return fsck: 0
#####################################
$ mkfs.minix -2 -n 60 image
-mkfs.minix: unsupported name length: 60
return mkfs: 8
#####################################
$ mkfs.minix -3 image
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
--- /dev/null
+$ 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
-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
--- /dev/null
+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
-mountpoint: --devno and --nofollow are mutually exclusive
1
--- /dev/null
+mountpoint: --devno and --nofollow are mutually exclusive
###### 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'.
--- /dev/null
+###### unknown arch
+setarch: qubit: Unrecognized architecture
+###### unknown command
+setarch: failed to execute /das/gibs/nicht: No such file or directory
-test_strutils: invalid size '-1' value
0 : 0 : 0B : 0 B
1 : 1 : 1B : 1 B
123 : 123 : 123B : 123 B
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
--- /dev/null
+test_strutils: invalid size '-1' value
+test_strutils: invalid size '' value
+test_strutils: invalid size ' ' value
+test_strutils: invalid size '1 ' value
<removed>6 4003 5002 1000 500K 83 Linux
<removed>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.
--- /dev/null
+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.
<removed>5 20481 26624 6144 3M 83 Linux
<removed>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.
--- /dev/null
+Partition 5 does not start on physical sector boundary.
+Partition 6 does not start on physical sector boundary.
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):
-unsupported GPT attribute bit 'GUID:NoBlockIOProtocol GUID:GUID:63 RequiredPartiton'
-sfdisk: <removed>: partition 2: failed to set partition attributes
--- /dev/null
+unsupported GPT attribute bit 'GUID:NoBlockIOProtocol GUID:GUID:63 RequiredPartiton'
+sfdisk: <removed>: partition 2: failed to set partition attributes
-failed to parse GPT attribute string 'NoBlockIOProtocolRequiredPartiton'
-sfdisk: <removed>: partition 2: failed to set partition attributes
--- /dev/null
+failed to parse GPT attribute string 'NoBlockIOProtocolRequiredPartiton'
+sfdisk: <removed>: partition 2: failed to set partition attributes
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):
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):
-unsupported GPT attribute bit 'FooBar 48 51'
-sfdisk: <removed>: partition 2: failed to set partition attributes
--- /dev/null
+unsupported GPT attribute bit 'FooBar 48 51'
+sfdisk: <removed>: partition 2: failed to set partition attributes
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):
Device Boot Start End Sectors Size Id Type
<removed>1 1 102399 102399 50M ee GPT
-Partition 1 does not start on physical sector boundary.
--- /dev/null
+Partition 1 does not start on physical sector boundary.
>>> Script header accepted.
>>> Script header accepted.
>>> Script header accepted.
->>> line 5: unsupported command
-
+>>>
New situation:
Leaving.
--- /dev/null
+line 5: unsupported command
>>> Script header accepted.
>>> Script header accepted.
>>> Script header accepted.
->>> line 5: unsupported command
-
+>>>
New situation:
Leaving.
--- /dev/null
+line 5: unsupported command
>>> Script header accepted.
>>> Script header accepted.
>>> Script header accepted.
->>> line 5: unsupported command
-
+>>>
New situation:
Leaving.
--- /dev/null
+line 5: unsupported command
>>> Script header accepted.
>>> Script header accepted.
>>> Script header accepted.
->>> line 5: unsupported command
-
+>>>
New situation:
Leaving.
--- /dev/null
+line 5: unsupported command
>>> Script header accepted.
>>> Script header accepted.
>>> Script header accepted.
->>> line 5: unsupported command
-
+>>>
New situation:
Leaving.
--- /dev/null
+line 5: unsupported command
=====Create FS================================
=====Create DOS================================
-
-
The old swap signature will be removed by a write command.
+
Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
Disk model: scsi_debug
Units: sectors of 1 * 512 = 512 bytes
>>> Created a new <removed>.
The old swap signature will be removed by a write command.
+
<removed>1: Created a new <removed>.
<removed>2: Done.
>>> Created a new <removed>.
<removed>1: Created a new <removed>.
-Partition #1 contains a swap signature.
The signature will be removed by a write command.
<removed>2: Done.
--- /dev/null
+Partition #1 contains a swap signature.
[ "$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"
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
}
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
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
"${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
# remove non comparable parts of fdisk output
if [ -n "${DEVNAME}" ]; then
- sed -i -e "s@${DEVNAME}@<removed>@;" $TS_OUTPUT
+ sed -i -e "s@${DEVNAME}@<removed>@;" $TS_OUTPUT $TS_ERRLOG
fi
sed -i \
-e 's/Welcome to fdisk.*/Welcome to fdisk <removed>./' \
-e 's/typescript file.*/typescript file <removed>./' \
-e 's@^\(I/O size (minimum/op.* bytes /\) [1-9][0-9]* @\1 <removed> @' \
- $TS_OUTPUT
+ $TS_OUTPUT $TS_ERRLOG
}
function run_tscmd {
local ret
- "$@" >> $TS_OUTPUT 2>&1
+ "$@" >> $TS_OUTPUT 2>> $TS_ERRLOG
ret=$?
echo "ret: $ret" >> "$TS_OUTPUT"
return $ret
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
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
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 <<EOF
+$TS_CMD_FDISK ${MD_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
n
p
1
udevadm settle
ts_log "Probe first 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 "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"
ts_scsi_debug_init dev_size_mb=51 sector_size=512
ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
n
p
1
ts_log "Create RAID1 device"
mdadm -q -S ${MD_DEVICE} &> /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"
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 <<EOF
+$TS_CMD_FDISK ${MD_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
n
p
1
udevadm settle
ts_log "Probe first 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 "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"
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
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
}
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
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
-
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
$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
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"
--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"
--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"
--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"
--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"
--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
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
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
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
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
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
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
DEVNAME=$(basename $TS_DEVICE)
ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
n
p
1
udevadm settle
ts_log "Alignment offsets:"
-cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $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
DEVNAME=$(basename $TS_DEVICE)
ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
n
p
1
udevadm settle
ts_log "Alignment offsets:"
-cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $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
DEVNAME=$(basename $TS_DEVICE)
ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
n
p
1
udevadm settle
ts_log "Alignment offsets:"
-cat /sys/block/${DEVNAME}/${DEVNAME}{1,2}/alignment_offset >> $TS_OUTPUT 2>&1
+cat /sys/block/${DEVNAME}/${DEVNAME}{1,2}/alignment_offset >> $TS_OUTPUT 2>> $TS_ERRLOG
ts_lock "md"
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 <<EOF
+$TS_CMD_FDISK ${MD_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
n
p
1
udevadm settle
ts_log "Alignment offsets (MD):"
-cat /sys/block/${MD_DEVNAME}/${MD_DEVNAME}p{1,2}/alignment_offset >> $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"
DEVICE=$TS_LODEV
ts_log "Create partitions"
-$TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
n
p
1
DEVNAME=$(basename $TS_DEVICE)
ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
n
p
1
udevadm settle
ts_log "Alignment offsets:"
-cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $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
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
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
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
}
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
$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
#
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
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
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
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
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
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
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
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
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
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
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
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
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
#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
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
# 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"
# 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"
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
[ -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"
--) 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
-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
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
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
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
$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
$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
$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
$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
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"
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
$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
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
$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
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
$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
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
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"
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"
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
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
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
TEST_IMAGE_NAME=$(ts_image_init 10)
ts_init_subtest "all-defaults"
-$TS_CMD_SFDISK --unit S ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_SFDISK --unit S ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
label: gpt
label-id: b181c399-4711-4c52-8b65-9e764541218d
TEST_IMAGE_NAME=$(ts_image_init 10)
ts_init_subtest "all-defaults-with-typo"
-$TS_CMD_SFDISK --unit S ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_SFDISK --unit S ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
label: gpt
label-id: b181c399-4711-4c52-8b65-9e764541218d
ts_finalize_subtest
ts_init_subtest "getattr"
-ts_run $TESTPROG --getattr ${TEST_IMAGE_NAME} 1 >> $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
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
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
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
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
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
-,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
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
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
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
-,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
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
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
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
-,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
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
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
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
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
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
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
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
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
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
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
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,
# 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
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
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,
# 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
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
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
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
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
LODEV=$( $TS_CMD_LOSETUP --find --nooverlap --show --offset=1000 "$BACKFILE" 2>> $TS_OUTPUT )
$TS_CMD_MOUNT "$BACKFILE" "$TS_MOUNTPOINT" 2>&1 \
| sed 's/:.*:/: <target>/; s/for .*/for <source>/' > $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
LODEV=$( $TS_CMD_LOSETUP --show -f "$BACKFILE" 2>>$TS_OUTPUT)
$TS_CMD_MOUNT -oloop=$LODEV "$BACKFILE" "$TS_MOUNTPOINT" 2>&1 \
| sed 's/:.*:/: <target>/; s/for .*/for <source>/' > $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
LODEV=$( $TS_CMD_LOSETUP --show -f "$BACKFILE"-2 2>> $TS_OUTPUT)
$TS_CMD_MOUNT -oloop=$LODEV "$BACKFILE" "$TS_MOUNTPOINT" 2>&1 \
| sed 's/:.*:/: <target>/; s/for .*/for <source>/' > $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"
[ -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/:.*:/: <target>/; s/for .*/for <source>/' >> $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")
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
$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"
$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"
$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"
$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"
$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"
$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"
--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"
$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"
$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"
$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"
$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"
$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"
$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"
$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"
$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"
$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"
$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."
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
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
}
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
}
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
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"
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
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
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
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
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
# 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
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
}
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
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
}
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
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
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})
$TS_CMD_FLOCK $1 $TS_OUTDIR/lockfile \
echo "$mesg" \
- > $TS_OUTPUT 2>&1
+ >> $TS_OUTPUT 2>> $TS_ERRLOG
local rc="$?"
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
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 </dev/null) |
- $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, return 1 when EOF'
-$TS_CMD_LINE </dev/null >> $TS_OUTPUT 2>&1
+$TS_CMD_LINE </dev/null >> $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
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'
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'
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'
$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
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
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
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
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
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
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
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
sed -e "s/ $MIN_SWAP_SIZE_KB KiB/ 10 pages/" \
-e "s:$IMAGE:<swapfile>:g" \
-e "s/insecure permissions [0-9]*/insecure permissions <perm>/g" \
- >> $TS_OUTPUT 2>&1
+ >> $TS_OUTPUT 2>> $TS_ERRLOG
rm -f $IMAGE
fallocate_or_skip $MIN_SWAP_SIZE $IMAGE
-e "s/($(( $MIN_SWAP_SIZE - $PAGE_SIZE )) bytes)/(9xPGSZ bytes)/" \
-e "s:$IMAGE:<swapfile>:g" \
-e "s/insecure permissions [0-9]*/insecure permissions <perm>/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
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
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
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
[ -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
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"
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"
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
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"
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"
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"
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"
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"
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"
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"
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"
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"
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
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
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"
#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
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"
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"
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"
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"
[ -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)
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
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
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
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
}
#
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
#
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
$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
[ -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"
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"
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
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
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
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
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
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
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
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
$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
$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
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
xz -dc $img > $outimg &&
$TS_CMD_PARTX $outimg ||
echo "failed: $?"
- } >$TS_OUTPUT 2>&1
+ } >> $TS_OUTPUT 2>> $TS_ERRLOG
ts_finalize_subtest
done
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
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
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
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
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)"
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 {
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 {
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
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"
ts_init_subtest "simple-commas"
-$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
2048,6144,L
8192, 6144,S
14336 , 6144 ,
ts_init_subtest "activate"
-$TS_CMD_SFDISK --activate ${TS_DEVICE} 1 >> $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
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 <<EOF
+$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
2048 6144 L
8192 6144 S
,,
ts_init_subtest "read-dump-case"
$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
udevadm settle
-$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
unit: sectors
label-id: 0x1ddc8a79
ts_init_subtest "read-dump"
$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
udevadm settle
-$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
unit: sectors
label-id: 0x1ddc8a79
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 "explicit-size"
$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
udevadm settle
-$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
label: dos
1, 1000, L
1001, 1000, S
,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
,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
,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
,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
,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
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
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
ts_init_subtest "all-defaults"
-$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
label: gpt
label-id: b181c399-4711-4c52-8b65-9e764541218d
$TS_CMD_SFDISK --part-uuid ${TS_DEVICE} 4 d4fcdc60-765d-4bc3-bd84-0d0b9842c6db &> /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
ts_init_subtest "read-dump"
$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
unit: sectors
label: gpt
label-id: 3b8559db-33af-43e9-befc-c331d829b539
${TS_DEVICE}4 : start=20480, size=81887,uuid=d2a29b0a-fdee-40c3-9bae-b9fa782c986c, name="GPT is the best"
EOF
udevadm settle
-$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $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
,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
ts_init_subtest "reorder"
$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
unit: sectors
label: gpt
label-id: 3b8559db-33af-43e9-befc-c331d829b539
EOF
udevadm settle
# why --reorder does not re-read?
-$TS_CMD_SFDISK --reorder ${TS_DEVICE} >> $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
}
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
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
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
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
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
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
# 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 <<EOF
+$TS_CMD_SFDISK --no-reread ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
label: dos
label-id: 0xda2e45ac
device: ${TS_DEVICE}
EOF
udevadm settle
# enlarge to use all space behind partition #4
-echo ',+,' | $TS_CMD_SFDISK --no-reread -N 4 ${TS_DEVICE} >> $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
TS_TOPDIR="${0%/*}/../.."
-TS_DESC="GPT"
+TS_DESC="script"
. $TS_TOPDIR/functions.sh
ts_init "$*"
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 <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
unit: sectors
label: gpt
label-id: 3b8559db-33af-43e9-befc-c331d829b539
${TS_DEVICE}4 : start=20480, size=81887,Type=44479540-F297-41B2-9AF7-D131D5F0458A, uuid=d2a29b0a-fdee-40c3-9bae-b9fa782c986c
EOF
udevadm settle
-$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $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 <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
unit: sectors
label: gpt
label-id: 3b8559db-33af-43e9-befc-c331d829b539
${TS_DEVICE}4 : start=20480; size=81887 ; uuid=d2a29b0a-fdee-40c3-9bae-b9fa782c986c
EOF
udevadm settle
-$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $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 "quotes"
$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
unit: sectors
label: gpt
label-id: 3b8559db-33af-43e9-befc-c331d829b539
${TS_DEVICE}4 : start=20480 uuid="d2a29b0a-fdee-40c3-9bae-b9fa782c986c", size=6144
EOF
udevadm settle
-$TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $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 "broken-1"
$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
unit: sectors
label: gpt
label-id: 3b8559db-33af-43e9-befc-c331d829b539
ts_init_subtest "broken-2"
$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
unit: sectors
label: gpt
label-id: 3b8559db-33af-43e9-befc-c331d829b539
ts_init_subtest "broken-3"
$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
unit: sectors
label: gpt
label-id: 3b8559db-33af-43e9-befc-c331d829b539
ts_init_subtest "broken-4"
$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
unit: sectors
label: gpt
label-id: 3b8559db-33af-43e9-befc-c331d829b539
ts_init_subtest "broken-5"
$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
udevadm settle
-$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>&1 <<EOF
+$TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
unit: sectors
label: gpt
label-id: 3b8559db-33af-43e9-befc-c331d829b539
ts_init_subtest "gpt-to-dos"
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 --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
#
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
$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
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
$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
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"
|| 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"
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"
$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"
$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
$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
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
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
}
test_flag --random
test_flag -r -n 65
-$TS_CMD_UUIDD -k -s "$UUIDD_SOCKET" 2>&1 |
- sed 's/pid [0-9]*.$/pid <num>./' >> "$TS_OUTPUT"
+$TS_CMD_UUIDD -k -s "$UUIDD_SOCKET" >> $TS_OUTPUT 2>> $TS_ERRLOG
+
+sed -i 's/pid [0-9]*.$/pid <num>./' $TS_OUTPUT $TS_ERRLOG
rm -f "$OUTPUT_FILE" "$UUIDD_PID" "$UUIDD_SOCKET"
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
}
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
projects / thirdparty / util-linux.git / commitdiff
