From 2a38870e3da60438ab4548846a1b639be6504338 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Thu, 19 Feb 2015 19:50:16 -0200 Subject: testsuite: port modules-order-compressed to module-playground --- testsuite/module-playground/Makefile | 6 ++++ testsuite/module-playground/mod-fake-cciss.c | 37 +++++++++++++++++++++ testsuite/module-playground/mod-fake-hpsa.c | 36 ++++++++++++++++++++ testsuite/module-playground/mod-fake-scsi-mod.c | 21 ++++++++++++ testsuite/populate-modules.sh | 16 +++++++++ .../lib/modules/3.5.4-1-ARCH/correct-modules.alias | 37 --------------------- .../3.5.4-1-ARCH/kernel/drivers/block/cciss.ko.gz | Bin 33491 -> 0 bytes .../3.5.4-1-ARCH/kernel/drivers/scsi/hpsa.ko.gz | Bin 32672 -> 0 bytes .../kernel/drivers/scsi/scsi_mod.ko.gz | Bin 81188 -> 0 bytes .../lib/modules/3.5.4-1-ARCH/modules.builtin | 0 .../lib/modules/3.5.4-1-ARCH/modules.order | 7 ---- .../lib/modules/4.4.4/correct-modules.alias | 37 +++++++++++++++++++++ .../lib/modules/4.4.4/modules.builtin | 0 .../lib/modules/4.4.4/modules.order | 7 ++++ testsuite/test-depmod.c | 2 +- 15 files changed, 161 insertions(+), 45 deletions(-) create mode 100644 testsuite/module-playground/mod-fake-cciss.c create mode 100644 testsuite/module-playground/mod-fake-hpsa.c create mode 100644 testsuite/module-playground/mod-fake-scsi-mod.c delete mode 100644 testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/correct-modules.alias delete mode 100644 testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/kernel/drivers/block/cciss.ko.gz delete mode 100644 testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/kernel/drivers/scsi/hpsa.ko.gz delete mode 100644 testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/kernel/drivers/scsi/scsi_mod.ko.gz delete mode 100644 testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/modules.builtin delete mode 100644 testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/modules.order create mode 100644 testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/4.4.4/correct-modules.alias create mode 100644 testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/4.4.4/modules.builtin create mode 100644 testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/4.4.4/modules.order diff --git a/testsuite/module-playground/Makefile b/testsuite/module-playground/Makefile index 65d668e..215cc82 100644 --- a/testsuite/module-playground/Makefile +++ b/testsuite/module-playground/Makefile @@ -18,6 +18,12 @@ obj-m += mod-loop-c.o obj-m += mod-loop-d.o obj-m += mod-loop-e.o +# mod-fake-*: fake the respective modules in kernel with these aliases. Aliases +# list was taken from 3.5.4 +obj-m += mod-fake-hpsa.o +obj-m += mod-fake-scsi-mod.o +obj-m += mod-fake-cciss.o + else # normal makefile KDIR ?= /lib/modules/`uname -r`/build diff --git a/testsuite/module-playground/mod-fake-cciss.c b/testsuite/module-playground/mod-fake-cciss.c new file mode 100644 index 0000000..9c46801 --- /dev/null +++ b/testsuite/module-playground/mod-fake-cciss.c @@ -0,0 +1,37 @@ +#include +#include + +static int __init test_module_init(void) +{ + return 0; +} + +static void test_module_exit(void) +{ +} +module_init(test_module_init); +module_exit(test_module_exit); + +MODULE_AUTHOR("Lucas De Marchi "); +MODULE_LICENSE("LGPL"); + +MODULE_ALIAS("pci:v00000E11d0000B060sv00000E11sd00004070bc*sc*i*"); +MODULE_ALIAS("pci:v00000E11d0000B178sv00000E11sd00004080bc*sc*i*"); +MODULE_ALIAS("pci:v00000E11d0000B178sv00000E11sd00004082bc*sc*i*"); +MODULE_ALIAS("pci:v00000E11d0000B178sv00000E11sd00004083bc*sc*i*"); +MODULE_ALIAS("pci:v00000E11d00000046sv00000E11sd00004091bc*sc*i*"); +MODULE_ALIAS("pci:v00000E11d00000046sv00000E11sd0000409Abc*sc*i*"); +MODULE_ALIAS("pci:v00000E11d00000046sv00000E11sd0000409Bbc*sc*i*"); +MODULE_ALIAS("pci:v00000E11d00000046sv00000E11sd0000409Cbc*sc*i*"); +MODULE_ALIAS("pci:v00000E11d00000046sv00000E11sd0000409Dbc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd00003220sv0000103Csd00003225bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd00003230sv0000103Csd00003223bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd00003230sv0000103Csd00003234bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd00003230sv0000103Csd00003235bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd00003238sv0000103Csd00003211bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd00003238sv0000103Csd00003212bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd00003238sv0000103Csd00003213bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd00003238sv0000103Csd00003214bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd00003238sv0000103Csd00003215bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd00003230sv0000103Csd00003237bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd00003230sv0000103Csd0000323Dbc*sc*i*"); diff --git a/testsuite/module-playground/mod-fake-hpsa.c b/testsuite/module-playground/mod-fake-hpsa.c new file mode 100644 index 0000000..99dc729 --- /dev/null +++ b/testsuite/module-playground/mod-fake-hpsa.c @@ -0,0 +1,36 @@ +#include +#include + +extern void dummy_export(void); + +static int __init test_module_init(void) +{ + dummy_export(); + return 0; +} + +static void test_module_exit(void) +{ +} +module_init(test_module_init); +module_exit(test_module_exit); + +MODULE_AUTHOR("Lucas De Marchi "); +MODULE_LICENSE("LGPL"); + +MODULE_ALIAS("pci:v0000103Cd0000323Asv0000103Csd00003241bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd0000323Asv0000103Csd00003243bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd0000323Asv0000103Csd00003245bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd0000323Asv0000103Csd00003247bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd0000323Asv0000103Csd00003249bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd0000323Asv0000103Csd0000324Abc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd0000323Asv0000103Csd0000324Bbc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd0000323Asv0000103Csd00003233bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd0000323Bsv0000103Csd00003350bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd0000323Bsv0000103Csd00003351bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd0000323Bsv0000103Csd00003352bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd0000323Bsv0000103Csd00003353bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd0000323Bsv0000103Csd00003354bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd0000323Bsv0000103Csd00003355bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd0000323Bsv0000103Csd00003356bc*sc*i*"); +MODULE_ALIAS("pci:v0000103Cd*sv*sd*bc01sc04i*"); diff --git a/testsuite/module-playground/mod-fake-scsi-mod.c b/testsuite/module-playground/mod-fake-scsi-mod.c new file mode 100644 index 0000000..916a04d --- /dev/null +++ b/testsuite/module-playground/mod-fake-scsi-mod.c @@ -0,0 +1,21 @@ +#include +#include + +static int __init test_module_init(void) +{ + return 0; +} + +static void test_module_exit(void) +{ +} +module_init(test_module_init); +module_exit(test_module_exit); + +void dummy_export(void) +{ +} +EXPORT_SYMBOL(dummy_export); + +MODULE_AUTHOR("Lucas De Marchi "); +MODULE_LICENSE("LGPL"); diff --git a/testsuite/populate-modules.sh b/testsuite/populate-modules.sh index 447851f..b61cbfa 100755 --- a/testsuite/populate-modules.sh +++ b/testsuite/populate-modules.sh @@ -34,8 +34,17 @@ map=( ["test-modprobe/oldkernel-force/lib/modules/3.3.3/kernel/"]="mod-simple.ko" ["test-modprobe/alias-to-none/lib/modules/4.4.4/kernel/"]="mod-simple.ko" ["test-modprobe/module-param-kcmdline/lib/modules/4.4.4/kernel/"]="mod-simple.ko" + ["test-depmod/modules-order-compressed/lib/modules/4.4.4/kernel/drivers/block/cciss.ko"]="mod-fake-cciss.ko" + ["test-depmod/modules-order-compressed/lib/modules/4.4.4/kernel/drivers/scsi/hpsa.ko"]="mod-fake-hpsa.ko" + ["test-depmod/modules-order-compressed/lib/modules/4.4.4/kernel/drivers/scsi/scsi_mod.ko"]="mod-fake-scsi-mod.ko" ) +gzip_array=( + "test-depmod/modules-order-compressed/lib/modules/4.4.4/kernel/drivers/block/cciss.ko" + "test-depmod/modules-order-compressed/lib/modules/4.4.4/kernel/drivers/scsi/hpsa.ko" + "test-depmod/modules-order-compressed/lib/modules/4.4.4/kernel/drivers/scsi/scsi_mod.ko" + ) + for k in ${!map[@]}; do dst=${ROOTFS}/$k src=${MODULE_PLAYGROUND}/${map[$k]} @@ -47,3 +56,10 @@ for k in ${!map[@]}; do install -D $src $dst fi done + +# start poking the final rootfs... + +# gzip these modules +for m in "${gzip_array[@]}"; do + gzip $ROOTFS/$m +done diff --git a/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/correct-modules.alias b/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/correct-modules.alias deleted file mode 100644 index 5675329..0000000 --- a/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/correct-modules.alias +++ /dev/null @@ -1,37 +0,0 @@ -# Aliases extracted from modules themselves. -alias pci:v0000103Cd00003230sv0000103Csd0000323Dbc*sc*i* cciss -alias pci:v0000103Cd00003230sv0000103Csd00003237bc*sc*i* cciss -alias pci:v0000103Cd00003238sv0000103Csd00003215bc*sc*i* cciss -alias pci:v0000103Cd00003238sv0000103Csd00003214bc*sc*i* cciss -alias pci:v0000103Cd00003238sv0000103Csd00003213bc*sc*i* cciss -alias pci:v0000103Cd00003238sv0000103Csd00003212bc*sc*i* cciss -alias pci:v0000103Cd00003238sv0000103Csd00003211bc*sc*i* cciss -alias pci:v0000103Cd00003230sv0000103Csd00003235bc*sc*i* cciss -alias pci:v0000103Cd00003230sv0000103Csd00003234bc*sc*i* cciss -alias pci:v0000103Cd00003230sv0000103Csd00003223bc*sc*i* cciss -alias pci:v0000103Cd00003220sv0000103Csd00003225bc*sc*i* cciss -alias pci:v00000E11d00000046sv00000E11sd0000409Dbc*sc*i* cciss -alias pci:v00000E11d00000046sv00000E11sd0000409Cbc*sc*i* cciss -alias pci:v00000E11d00000046sv00000E11sd0000409Bbc*sc*i* cciss -alias pci:v00000E11d00000046sv00000E11sd0000409Abc*sc*i* cciss -alias pci:v00000E11d00000046sv00000E11sd00004091bc*sc*i* cciss -alias pci:v00000E11d0000B178sv00000E11sd00004083bc*sc*i* cciss -alias pci:v00000E11d0000B178sv00000E11sd00004082bc*sc*i* cciss -alias pci:v00000E11d0000B178sv00000E11sd00004080bc*sc*i* cciss -alias pci:v00000E11d0000B060sv00000E11sd00004070bc*sc*i* cciss -alias pci:v0000103Cd*sv*sd*bc01sc04i* hpsa -alias pci:v0000103Cd0000323Bsv0000103Csd00003356bc*sc*i* hpsa -alias pci:v0000103Cd0000323Bsv0000103Csd00003355bc*sc*i* hpsa -alias pci:v0000103Cd0000323Bsv0000103Csd00003354bc*sc*i* hpsa -alias pci:v0000103Cd0000323Bsv0000103Csd00003353bc*sc*i* hpsa -alias pci:v0000103Cd0000323Bsv0000103Csd00003352bc*sc*i* hpsa -alias pci:v0000103Cd0000323Bsv0000103Csd00003351bc*sc*i* hpsa -alias pci:v0000103Cd0000323Bsv0000103Csd00003350bc*sc*i* hpsa -alias pci:v0000103Cd0000323Asv0000103Csd00003233bc*sc*i* hpsa -alias pci:v0000103Cd0000323Asv0000103Csd0000324Bbc*sc*i* hpsa -alias pci:v0000103Cd0000323Asv0000103Csd0000324Abc*sc*i* hpsa -alias pci:v0000103Cd0000323Asv0000103Csd00003249bc*sc*i* hpsa -alias pci:v0000103Cd0000323Asv0000103Csd00003247bc*sc*i* hpsa -alias pci:v0000103Cd0000323Asv0000103Csd00003245bc*sc*i* hpsa -alias pci:v0000103Cd0000323Asv0000103Csd00003243bc*sc*i* hpsa -alias pci:v0000103Cd0000323Asv0000103Csd00003241bc*sc*i* hpsa diff --git a/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/kernel/drivers/block/cciss.ko.gz b/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/kernel/drivers/block/cciss.ko.gz deleted file mode 100644 index 0684dc1..0000000 Binary files a/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/kernel/drivers/block/cciss.ko.gz and /dev/null differ diff --git a/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/kernel/drivers/scsi/hpsa.ko.gz b/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/kernel/drivers/scsi/hpsa.ko.gz deleted file mode 100644 index 403d6fb..0000000 Binary files a/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/kernel/drivers/scsi/hpsa.ko.gz and /dev/null differ diff --git a/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/kernel/drivers/scsi/scsi_mod.ko.gz b/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/kernel/drivers/scsi/scsi_mod.ko.gz deleted file mode 100644 index 2306bb1..0000000 Binary files a/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/kernel/drivers/scsi/scsi_mod.ko.gz and /dev/null differ diff --git a/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/modules.builtin b/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/modules.builtin deleted file mode 100644 index e69de29..0000000 diff --git a/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/modules.order b/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/modules.order deleted file mode 100644 index 4b64309..0000000 --- a/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/3.5.4-1-ARCH/modules.order +++ /dev/null @@ -1,7 +0,0 @@ -#336 -kernel/drivers/block/cciss.ko -#2094 -kernel/drivers/scsi/scsi_mod.ko -#2137 -kernel/drivers/scsi/hpsa.ko - diff --git a/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/4.4.4/correct-modules.alias b/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/4.4.4/correct-modules.alias new file mode 100644 index 0000000..5675329 --- /dev/null +++ b/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/4.4.4/correct-modules.alias @@ -0,0 +1,37 @@ +# Aliases extracted from modules themselves. +alias pci:v0000103Cd00003230sv0000103Csd0000323Dbc*sc*i* cciss +alias pci:v0000103Cd00003230sv0000103Csd00003237bc*sc*i* cciss +alias pci:v0000103Cd00003238sv0000103Csd00003215bc*sc*i* cciss +alias pci:v0000103Cd00003238sv0000103Csd00003214bc*sc*i* cciss +alias pci:v0000103Cd00003238sv0000103Csd00003213bc*sc*i* cciss +alias pci:v0000103Cd00003238sv0000103Csd00003212bc*sc*i* cciss +alias pci:v0000103Cd00003238sv0000103Csd00003211bc*sc*i* cciss +alias pci:v0000103Cd00003230sv0000103Csd00003235bc*sc*i* cciss +alias pci:v0000103Cd00003230sv0000103Csd00003234bc*sc*i* cciss +alias pci:v0000103Cd00003230sv0000103Csd00003223bc*sc*i* cciss +alias pci:v0000103Cd00003220sv0000103Csd00003225bc*sc*i* cciss +alias pci:v00000E11d00000046sv00000E11sd0000409Dbc*sc*i* cciss +alias pci:v00000E11d00000046sv00000E11sd0000409Cbc*sc*i* cciss +alias pci:v00000E11d00000046sv00000E11sd0000409Bbc*sc*i* cciss +alias pci:v00000E11d00000046sv00000E11sd0000409Abc*sc*i* cciss +alias pci:v00000E11d00000046sv00000E11sd00004091bc*sc*i* cciss +alias pci:v00000E11d0000B178sv00000E11sd00004083bc*sc*i* cciss +alias pci:v00000E11d0000B178sv00000E11sd00004082bc*sc*i* cciss +alias pci:v00000E11d0000B178sv00000E11sd00004080bc*sc*i* cciss +alias pci:v00000E11d0000B060sv00000E11sd00004070bc*sc*i* cciss +alias pci:v0000103Cd*sv*sd*bc01sc04i* hpsa +alias pci:v0000103Cd0000323Bsv0000103Csd00003356bc*sc*i* hpsa +alias pci:v0000103Cd0000323Bsv0000103Csd00003355bc*sc*i* hpsa +alias pci:v0000103Cd0000323Bsv0000103Csd00003354bc*sc*i* hpsa +alias pci:v0000103Cd0000323Bsv0000103Csd00003353bc*sc*i* hpsa +alias pci:v0000103Cd0000323Bsv0000103Csd00003352bc*sc*i* hpsa +alias pci:v0000103Cd0000323Bsv0000103Csd00003351bc*sc*i* hpsa +alias pci:v0000103Cd0000323Bsv0000103Csd00003350bc*sc*i* hpsa +alias pci:v0000103Cd0000323Asv0000103Csd00003233bc*sc*i* hpsa +alias pci:v0000103Cd0000323Asv0000103Csd0000324Bbc*sc*i* hpsa +alias pci:v0000103Cd0000323Asv0000103Csd0000324Abc*sc*i* hpsa +alias pci:v0000103Cd0000323Asv0000103Csd00003249bc*sc*i* hpsa +alias pci:v0000103Cd0000323Asv0000103Csd00003247bc*sc*i* hpsa +alias pci:v0000103Cd0000323Asv0000103Csd00003245bc*sc*i* hpsa +alias pci:v0000103Cd0000323Asv0000103Csd00003243bc*sc*i* hpsa +alias pci:v0000103Cd0000323Asv0000103Csd00003241bc*sc*i* hpsa diff --git a/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/4.4.4/modules.builtin b/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/4.4.4/modules.builtin new file mode 100644 index 0000000..e69de29 diff --git a/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/4.4.4/modules.order b/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/4.4.4/modules.order new file mode 100644 index 0000000..4b64309 --- /dev/null +++ b/testsuite/rootfs-pristine/test-depmod/modules-order-compressed/lib/modules/4.4.4/modules.order @@ -0,0 +1,7 @@ +#336 +kernel/drivers/block/cciss.ko +#2094 +kernel/drivers/scsi/scsi_mod.ko +#2137 +kernel/drivers/scsi/hpsa.ko + diff --git a/testsuite/test-depmod.c b/testsuite/test-depmod.c index 3b48cc6..732a9d0 100644 --- a/testsuite/test-depmod.c +++ b/testsuite/test-depmod.c @@ -25,7 +25,7 @@ #include "testsuite.h" -#define MODULES_ORDER_UNAME "3.5.4-1-ARCH" +#define MODULES_ORDER_UNAME "4.4.4" #define MODULES_ORDER_ROOTFS TESTSUITE_ROOTFS "test-depmod/modules-order-compressed" #define MODULES_ORDER_LIB_MODULES MODULES_ORDER_ROOTFS "/lib/modules/" MODULES_ORDER_UNAME static noreturn int depmod_modules_order_for_compressed(const struct test *t) -- cgit v1.2.1