[2/2] testsuite: also test xz compression

Commit Message

Lucas De Marchi Jan. 30, 2021, 2:36 a.m. UTC

---
 testsuite/populate-modules.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Lucas De Marchi Feb. 6, 2021, 3:59 a.m. UTC | #1

On Thu, Feb 4, 2021 at 2:35 AM Petr Vorel <[e-mail]> wrote:
>
> Hi,
>
> Reviewed-by: Petr Vorel <[e-mail]>


pushed, thanks.


>
> Thanks!
>
> BTW I still have issues with testsuite/test-depmod locally, but probably my
> wrong setup (testing also other configure options than this one):
>
> $ CFLAGS='-g -O2' --enable-debug && make -j`nproc` && make check

humn...  more things to fixup

Lucas De Marchi
>
> depmod: WARNING: could not open modules.order at /lib/modules/4.4.4: No such file or directory
> depmod: WARNING: could not open modules.order at /lib/modules/4.4.4: No such file or directory
> depmod: WARNING: could not open modules.builtin at /lib/modules/4.4.4: No such file or directory
> depmod: WARNING: could not open modules.builtin at /lib/modules/4.4.4: No such file or directory
> depmod: WARNING: could not open modules.order at /lib/modules/4.4.4: No such file or directory
> depmod: WARNING: could not open modules.order at /lib/modules/4.4.4: No such file or directory
> depmod: WARNING: could not open modules.builtin at /lib/modules/4.4.4: No such file or directory
> depmod: WARNING: could not open modules.builtin at /lib/modules/4.4.4: No such file or directory
> TESTSUITE: running depmod_search_order_override, in forked context
> TESTSUITE: SKIPPED: depmod_search_order_override
> TESTSUITE: ------
> TESTSUITE: running depmod_search_order_external_last, in forked context
> TESTSUITE: 'depmod_search_order_external_last' [31183] exited with return code 0
> TESTSUITE: PASSED: depmod_search_order_external_last
> TESTSUITE: ------
> TESTSUITE: running depmod_search_order_external_first, in forked context
> TESTSUITE: SKIPPED: depmod_search_order_external_first
> TESTSUITE: ------
> TESTSUITE: running depmod_detect_loop, in forked context
> TESTSUITE: SKIPPED: depmod_detect_loop
> TESTSUITE: ------
> TESTSUITE: running depmod_search_order_same_prefix, in forked context
> TESTSUITE: 'depmod_search_order_same_prefix' [31182] exited with return code 0
> TESTSUITE: ERR: sizes do not match /src/kmod/testsuite/rootfs/test-depmod/search-order-same-prefix/lib/modules/4.4.4/correct-modules.dep /src/kmod/testsuite/rootfs/test-depmod/search-order-same-prefix/lib/modules/4.4.4/modules.dep
> TESTSUITE: ERR: FAILED: exit ok but outputs do not match: depmod_search_order_same_prefix
> TESTSUITE: ------
> FAIL testsuite/test-depmod (exit status: 1)
>
> Kind regards,
> Petr

Patch

diff --git a/testsuite/populate-modules.sh b/testsuite/populate-modules.sh
index ae43884..099f026 100755
--- a/testsuite/populate-modules.sh
+++ b/testsuite/populate-modules.sh
@@ -72,6 +72,9 @@  map=(
 
 gzip_array=(
     "test-depmod/modules-order-compressed/lib/modules/4.4.4/kernel/drivers/block/cciss.ko"
+    )
+
+xz_array=(
     "test-depmod/modules-order-compressed/lib/modules/4.4.4/kernel/drivers/scsi/scsi_mod.ko"
     )
 
@@ -112,6 +115,12 @@  if feature_enabled ZLIB; then
 	done
 fi
 
+if feature_enabled XZ; then
+	for m in "${xz_array[@]}"; do
+	    xz "$ROOTFS/$m"
+	done
+fi
+
 if feature_enabled ZSTD; then
 	for m in "${zstd_array[@]}"; do
 	    zstd --rm $ROOTFS/$m