tests: (libfdisk) remove reliance on buffer behaviour of standard streams
The tests in libfdisk/mkpart-full all rely on the buffering behaviour of standard output and standard error streams, most importantly that stderr is non-buffering and stdout is buffering. This doesn't hold on all libc implementations when redirecting to a file, breaking the test suite on such platforms. Use `ts_run --unbuffered` to stop buffering of the standard output stream to fix this. Signed-off-by: Patrick Steinhardt <ps@pks.im>
This commit is contained in:
Patrick Steinhardt
Karel Zak
parent
801d689e47
commit
8892f94c57
|
|
@ -1,18 +1,18 @@
|
|||
Created a new <removed>.
|
||||
Requested partition: <partno=0,start=2048,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=1,start=4096,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=2,start=6144,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=3,start=8192,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=4,start=10240,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=5,start=12288,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=6,start=14336,size=2048>
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
|
||||
Units: sectors of 1 * 512 = 512 bytes
|
||||
Sector size (logical/physical): 512 bytes / 512 bytes
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
Created a new <removed>.
|
||||
Requested partition: <partno=0,start=2048,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=1,start=4096,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=2,start=6144,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=3,start=5000,size=2048>
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Sector 5000 already used.
|
||||
sample-fdisk-mkpart-fullspec: failed to add #4 partition
|
||||
Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
Created a new <removed>.
|
||||
Requested partition: <partno=<default>,start=2048,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=<default>,start=4096,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=<default>,start=6144,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=<default>,start=8192,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=<default>,start=10240,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=<default>,start=12288,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=<default>,start=14336,size=2048>
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
|
||||
Units: sectors of 1 * 512 = 512 bytes
|
||||
Sector size (logical/physical): 512 bytes / 512 bytes
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
Created a new <removed>.
|
||||
Requested partition: <partno=0,start=2048,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=1,start=4096,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=3,start=6144,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=4,start=8192,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=6,start=10240,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=7,start=12288,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=8,start=14336,size=2048>
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
|
||||
Units: sectors of 1 * 512 = 512 bytes
|
||||
Sector size (logical/physical): 512 bytes / 512 bytes
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
Created a new <removed>.
|
||||
Requested partition: <partno=0,start=2048,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=1,start=6144,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=2,start=8192,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=3,start=12288,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=4,start=14336,size=2048>
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
|
||||
Units: sectors of 1 * 512 = 512 bytes
|
||||
Sector size (logical/physical): 512 bytes / 512 bytes
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
Created a new <removed>.
|
||||
Requested partition: <partno=0,start=2048,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=1,start=4096,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=2,start=6144,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=3,start=8192,size=22528>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=4,start=10240,size=2048>
|
||||
Requested partition: <partno=5,start=4096,size=2048>
|
||||
sample-fdisk-mkpart-fullspec: failed to add #6 partition
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Adding logical partition 5
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=5,start=4096,size=2048>
|
||||
sample-fdisk-mkpart-fullspec: failed to add #6 partition
|
||||
Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
|
||||
Units: sectors of 1 * 512 = 512 bytes
|
||||
Sector size (logical/physical): 512 bytes / 512 bytes
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
Created a new <removed>.
|
||||
Requested partition: <partno=0,start=2048,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=1,start=4096,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=2,start=4096,size=2048>
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Start sector 4096 out of range.
|
||||
sample-fdisk-mkpart-fullspec: failed to add #3 partition
|
||||
Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
Created a new <removed>.
|
||||
Requested partition: <partno=0,start=2048,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=1,start=4096,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=6,start=6144,size=2048>
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Extended partition does not exists. Failed to add logical partition.
|
||||
sample-fdisk-mkpart-fullspec: failed to add #7 partition
|
||||
Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
Created a new <removed>.
|
||||
Requested partition: <partno=0,start=2048,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=1,start=4096,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=2,start=6144,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=3,start=8192,size=22528>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=4,start=10240,size=2048>
|
||||
Requested partition: <partno=5,start=14336,size=2048>
|
||||
Requested partition: <partno=6,start=18432,size=12288>
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Adding logical partition 5
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=5,start=14336,size=2048>
|
||||
Adding logical partition 6
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=6,start=18432,size=12288>
|
||||
Adding logical partition 7
|
||||
Created a new <removed>.
|
||||
Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
Created a new <removed>.
|
||||
Requested partition: <partno=<default>,start=2048,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=<default>,start=4096,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=<default>,start=6144,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=<default>,start=8192,size=22528>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=<default>,start=10240,size=2048>
|
||||
Requested partition: <partno=<default>,start=14336,size=2048>
|
||||
Requested partition: <partno=<default>,start=18432,size=12288>
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Adding logical partition 5
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=<default>,start=14336,size=2048>
|
||||
Adding logical partition 6
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=<default>,start=18432,size=12288>
|
||||
Adding logical partition 7
|
||||
Created a new <removed>.
|
||||
Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
Created a new <removed>.
|
||||
Requested partition: <partno=0,start=2048,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=1,start=4096,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=2,start=6144,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=3,start=8192,size=22528>
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
|
||||
Units: sectors of 1 * 512 = 512 bytes
|
||||
Sector size (logical/physical): 512 bytes / 512 bytes
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
Created a new <removed>.
|
||||
Requested partition: <partno=<default>,start=2048,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=<default>,start=4096,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=<default>,start=6144,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=<default>,start=8192,size=22528>
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
|
||||
Units: sectors of 1 * 512 = 512 bytes
|
||||
Sector size (logical/physical): 512 bytes / 512 bytes
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
Created a new <removed>.
|
||||
Requested partition: <partno=0,start=2048,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=1,start=6144,size=2048>
|
||||
Created a new <removed>.
|
||||
Requested partition: <partno=2,start=8192,size=2048>
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Created a new <removed>.
|
||||
Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
|
||||
Units: sectors of 1 * 512 = 512 bytes
|
||||
Sector size (logical/physical): 512 bytes / 512 bytes
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ ts_check_test_command "$TS_CMD_WIPEFS"
|
|||
TEST_IMAGE_NAME=$(ts_image_init 15)
|
||||
|
||||
ts_init_subtest "mbr-primary"
|
||||
$TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
|
||||
ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
|
||||
1,2048,2048 \
|
||||
2,4096,2048 \
|
||||
3,6144,2048 \
|
||||
|
|
@ -45,7 +45,7 @@ $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
|
|||
|
||||
|
||||
ts_init_subtest "mbr-primary-nopartno"
|
||||
$TESTPROG --label mbr --device ${TEST_IMAGE_NAME} -- \
|
||||
ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} -- \
|
||||
-,2048,2048 \
|
||||
-,4096,2048 \
|
||||
-,6144,2048 \
|
||||
|
|
@ -59,7 +59,7 @@ $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
|
|||
|
||||
## no extended but partno > 4 requested
|
||||
ts_init_subtest "mbr-err-primary"
|
||||
$TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
|
||||
ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
|
||||
1,2048,2048 \
|
||||
2,4096,2048 \
|
||||
7,6144,2048 \
|
||||
|
|
@ -72,7 +72,7 @@ $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
|
|||
|
||||
## no extended but partno > 4 requested
|
||||
ts_init_subtest "mbr-err-nospace"
|
||||
$TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
|
||||
ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
|
||||
1,2048,2048 \
|
||||
2,4096,2048 \
|
||||
3,4096,2048 \
|
||||
|
|
@ -85,7 +85,7 @@ $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
|
|||
|
||||
|
||||
ts_init_subtest "mbr-logical"
|
||||
$TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
|
||||
ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
|
||||
1,2048,2048 \
|
||||
2,4096,2048 \
|
||||
3,6144,2048 \
|
||||
|
|
@ -101,7 +101,7 @@ ts_finalize_subtest
|
|||
$TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
|
||||
|
||||
ts_init_subtest "mbr-nopartno"
|
||||
$TESTPROG --label mbr --device ${TEST_IMAGE_NAME} -- \
|
||||
ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} -- \
|
||||
-,2048,2048 \
|
||||
-,4096,2048 \
|
||||
-,6144,2048 \
|
||||
|
|
@ -118,7 +118,7 @@ $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
|
|||
|
||||
### 6th partition (logical) out of extended
|
||||
ts_init_subtest "mbr-err-logical"
|
||||
$TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
|
||||
ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
|
||||
1,2048,2048 \
|
||||
2,4096,2048 \
|
||||
3,6144,2048 \
|
||||
|
|
@ -134,7 +134,7 @@ ts_finalize_subtest
|
|||
$TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
|
||||
|
||||
ts_init_subtest "mbr-space-gap"
|
||||
$TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
|
||||
ts_run --unbuffered $TESTPROG --label mbr --device ${TEST_IMAGE_NAME} \
|
||||
1,2048,2048 \
|
||||
2,6144,2048 \
|
||||
3,8192,2048 \
|
||||
|
|
@ -146,7 +146,7 @@ ts_finalize_subtest
|
|||
$TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
|
||||
|
||||
ts_init_subtest "gpt"
|
||||
$TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
|
||||
ts_run --unbuffered $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
|
||||
1,2048,2048 \
|
||||
2,4096,2048 \
|
||||
3,6144,2048 \
|
||||
|
|
@ -162,7 +162,7 @@ ts_finalize_subtest
|
|||
$TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
|
||||
|
||||
ts_init_subtest "gpt-nopartno"
|
||||
$TESTPROG --label gpt --device ${TEST_IMAGE_NAME} -- \
|
||||
ts_run --unbuffered $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} -- \
|
||||
-,2048,2048 \
|
||||
-,4096,2048 \
|
||||
-,6144,2048 \
|
||||
|
|
@ -179,7 +179,7 @@ $TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
|
|||
|
||||
### 4th partition overlap 4th and 5th
|
||||
ts_init_subtest "gpt-err-overlap"
|
||||
$TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
|
||||
ts_run --unbuffered $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
|
||||
1,2048,2048 \
|
||||
2,4096,2048 \
|
||||
3,6144,2048 \
|
||||
|
|
@ -195,7 +195,7 @@ ts_finalize_subtest
|
|||
$TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
|
||||
|
||||
ts_init_subtest "gpt-partno-gap"
|
||||
$TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
|
||||
ts_run --unbuffered $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
|
||||
1,2048,2048 \
|
||||
2,4096,2048 \
|
||||
4,6144,2048 \
|
||||
|
|
@ -211,7 +211,7 @@ ts_finalize_subtest
|
|||
$TS_CMD_WIPEFS --all --force ${TEST_IMAGE_NAME} &> /dev/null
|
||||
|
||||
ts_init_subtest "gpt-space-gap"
|
||||
$TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
|
||||
ts_run --unbuffered $TESTPROG --label gpt --device ${TEST_IMAGE_NAME} \
|
||||
1,2048,2048 \
|
||||
2,6144,2048 \
|
||||
3,8192,2048 \
|
||||
|
|
|
|||
Loading…
Reference in New Issue