diff options
author | Rasmus Villemoes <rasmus.villemoes@prevas.dk> | 2021-06-04 21:46:29 +0200 |
---|---|---|
committer | Rasmus Villemoes <rasmus.villemoes@prevas.dk> | 2021-06-04 22:10:42 +0200 |
commit | f1cab395581db35fff08bf825b728597e09f18dc (patch) | |
tree | 1ccc76f8c37abe76bec82d0fe557b8bc419691fa | |
parent | 9e7f23aa98421386ca23331dfae4d0b31a6239df (diff) | |
download | genimage-f1cab395581db35fff08bf825b728597e09f18dc.tar.gz genimage-f1cab395581db35fff08bf825b728597e09f18dc.tar.xz |
test: add tests for --includepath
Also ensure --includepath is rejected when it is not supported.
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
-rw-r--r-- | Makefile.am | 7 | ||||
-rwxr-xr-x | test/basic-images.test | 33 | ||||
-rw-r--r-- | test/include-aaa.fdisk | 2 | ||||
-rw-r--r-- | test/include-bbb.fdisk | 2 | ||||
-rw-r--r-- | test/include-ccc.fdisk | 2 | ||||
-rw-r--r-- | test/include-test.config | 5 | ||||
-rw-r--r-- | test/include.config | 7 | ||||
-rw-r--r-- | test/include/aaa/include-test.config | 5 | ||||
-rw-r--r-- | test/include/bbb/include-test.config | 5 |
9 files changed, 68 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 9a2b42e..45ac82b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -92,6 +92,13 @@ EXTRA_DIST += \ test/hdimage-fail5.config \ test/hdimage-fail6.config \ test/hdimage-fail7.config \ + test/include-aaa.fdisk \ + test/include-bbb.fdisk \ + test/include-ccc.fdisk \ + test/include-test.config \ + test/include.config \ + test/include/aaa/include-test.config \ + test/include/bbb/include-test.config \ test/iso.config \ test/jffs2.config \ test/jffs2.md5 \ diff --git a/test/basic-images.test b/test/basic-images.test index 416e96d..414771b 100755 --- a/test/basic-images.test +++ b/test/basic-images.test @@ -43,6 +43,7 @@ run_genimage() { --inputpath=input \ --rootpath=root \ --tmppath=tmp \ + ${extra_opts} \ --config "${1}" } @@ -495,6 +496,38 @@ test_expect_success "bootloader-hole5" " setup_gpt_files && OFFSET=128K run_genimage hole.config" + +"$genimage" --help | grep -q 'GENIMAGE_INCLUDEPATH' && test_set_prereq "includepath" + +test_expect_success fdisk-gpt,sfdisk-gpt "includepath1" " + run_genimage include.config && + sanitized_fdisk_sfdisk images/include.hdimage > include.fdisk && + test_cmp '${testdir}/include-ccc.fdisk' include.fdisk +" + +test_expect_success fdisk-gpt,sfdisk-gpt,includepath "includepath2" " + extra_opts='--includepath=${testdir}/include/aaa' run_genimage include.config && + sanitized_fdisk_sfdisk images/include.hdimage > include.fdisk && + test_cmp '${testdir}/include-aaa.fdisk' include.fdisk +" + +test_expect_success fdisk-gpt,sfdisk-gpt,includepath "includepath3" " + extra_opts='--includepath=${testdir}/include/bbb:${testdir}/include/aaa' run_genimage include.config && + sanitized_fdisk_sfdisk images/include.hdimage > include.fdisk && + test_cmp '${testdir}/include-bbb.fdisk' include.fdisk +" + +test_expect_success fdisk-gpt,sfdisk-gpt,includepath "includepath4" " + extra_opts='--includepath=.:${testdir}/include/bbb' run_genimage include.config && + sanitized_fdisk_sfdisk images/include.hdimage > include.fdisk && + test_cmp '${testdir}/include-ccc.fdisk' include.fdisk +" + +test_expect_success !includepath "includepath5" " + extra_opts='--includepath=${testdir}/include/aaa' test_must_fail run_genimage include.config +" + + test_done # vim: syntax=sh diff --git a/test/include-aaa.fdisk b/test/include-aaa.fdisk new file mode 100644 index 0000000..dd4ca72 --- /dev/null +++ b/test/include-aaa.fdisk @@ -0,0 +1,2 @@ +Disk identifier: 6A921DBB-823D-44C4-8EDC-ECB038E6D743 +images/include.hdimage1:start=34,size=2048,type=0FC63DAF-8483-4772-8E79-3D69D8477DE4,uuid=59DA602D-C2EA-4F18-818F-CF7947BAD0CA,name="aaa" diff --git a/test/include-bbb.fdisk b/test/include-bbb.fdisk new file mode 100644 index 0000000..917393b --- /dev/null +++ b/test/include-bbb.fdisk @@ -0,0 +1,2 @@ +Disk identifier: 6A921DBB-823D-44C4-8EDC-ECB038E6D743 +images/include.hdimage1:start=34,size=4096,type=0FC63DAF-8483-4772-8E79-3D69D8477DE4,uuid=284635E9-6B62-41CA-A02A-357C01517279,name="bbb" diff --git a/test/include-ccc.fdisk b/test/include-ccc.fdisk new file mode 100644 index 0000000..b37bed9 --- /dev/null +++ b/test/include-ccc.fdisk @@ -0,0 +1,2 @@ +Disk identifier: 6A921DBB-823D-44C4-8EDC-ECB038E6D743 +images/include.hdimage1:start=34,size=6144,type=0FC63DAF-8483-4772-8E79-3D69D8477DE4,uuid=088813B5-7028-4540-99DA-B10015FD07DA,name="ccc" diff --git a/test/include-test.config b/test/include-test.config new file mode 100644 index 0000000..98949ce --- /dev/null +++ b/test/include-test.config @@ -0,0 +1,5 @@ +partition ccc { + size = 3M + partition-type-uuid = "L" + partition-uuid = "088813b5-7028-4540-99da-b10015fd07da" +} diff --git a/test/include.config b/test/include.config new file mode 100644 index 0000000..87ac6ce --- /dev/null +++ b/test/include.config @@ -0,0 +1,7 @@ +image include.hdimage { + hdimage { + partition-table-type = "gpt" + disk-uuid = "6a921dbb-823d-44c4-8edc-ecb038e6d743" + } + include("include-test.config") +} diff --git a/test/include/aaa/include-test.config b/test/include/aaa/include-test.config new file mode 100644 index 0000000..b68e8dd --- /dev/null +++ b/test/include/aaa/include-test.config @@ -0,0 +1,5 @@ +partition aaa { + size = 1M + partition-type-uuid = "L" + partition-uuid = "59da602d-c2ea-4f18-818f-cf7947bad0ca" +} diff --git a/test/include/bbb/include-test.config b/test/include/bbb/include-test.config new file mode 100644 index 0000000..75ab344 --- /dev/null +++ b/test/include/bbb/include-test.config @@ -0,0 +1,5 @@ +partition bbb { + size = 2M + partition-type-uuid = "L" + partition-uuid = "284635e9-6b62-41ca-a02a-357c01517279" +} |