1
0
mirror of https://github.com/systemd/systemd.git synced 2024-10-30 06:25:37 +03:00

test-loop-block: tighten tests a bit - check fstype, too

Let's verify that we properly created the file systems once we did so.
And tets this way that our dissector works correctly.
This commit is contained in:
Lennart Poettering 2022-12-01 17:15:10 +01:00
parent 4f0fafb6f0
commit 02c15120a1

View File

@ -44,6 +44,15 @@ static void verify_dissected_image(DissectedImage *dissected) {
assert_se(dissected->partitions[PARTITION_HOME].node); assert_se(dissected->partitions[PARTITION_HOME].node);
} }
static void verify_dissected_image_harder(DissectedImage *dissected) {
verify_dissected_image(dissected);
assert_se(streq(dissected->partitions[PARTITION_ESP].fstype, "vfat"));
assert_se(streq(dissected->partitions[PARTITION_XBOOTLDR].fstype, "vfat"));
assert_se(streq(dissected->partitions[PARTITION_ROOT].fstype, "ext4"));
assert_se(streq(dissected->partitions[PARTITION_HOME].fstype, "ext4"));
}
static void* thread_func(void *ptr) { static void* thread_func(void *ptr) {
int fd = PTR_TO_FD(ptr); int fd = PTR_TO_FD(ptr);
int r; int r;
@ -247,7 +256,7 @@ static int run(int argc, char *argv[]) {
dissected = dissected_image_unref(dissected); dissected = dissected_image_unref(dissected);
assert_se(dissect_loop_device(loop, NULL, NULL, DISSECT_IMAGE_ADD_PARTITION_DEVICES|DISSECT_IMAGE_PIN_PARTITION_DEVICES, &dissected) >= 0); assert_se(dissect_loop_device(loop, NULL, NULL, DISSECT_IMAGE_ADD_PARTITION_DEVICES|DISSECT_IMAGE_PIN_PARTITION_DEVICES, &dissected) >= 0);
verify_dissected_image(dissected); verify_dissected_image_harder(dissected);
assert_se(mkdtemp_malloc(NULL, &mounted) >= 0); assert_se(mkdtemp_malloc(NULL, &mounted) >= 0);