testsuite: separate insert and delete rootfs from modinfo

diff --git a/testsuite/rootfs-pristine/test-init/correct.txt b/testsuite/rootfs-pristine/test-init/correct.txt
new file mode 100644 (file)
index 0000000..1682154
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-init/correct.txt
@@ -0,0 +1,28 @@
+filename:       /ext4-i686.ko
+license:        GPL
+description:    Fourth Extended Filesystem
+author:         Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others
+srcversion:     A80608676B83D55514B450E
+depends:        mbcache,jbd2
+vermagic:       2.6.32-220.el6.i686 SMP mod_unload modversions 686 
+filename:       /ext4-ppc64.ko
+license:        GPL
+description:    Fourth Extended Filesystem
+author:         Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others
+srcversion:     670806A855D5836BE150B41
+depends:        jbd2,mbcache
+vermagic:       2.6.32-220.el6.ppc64 SMP mod_unload modversions 
+filename:       /ext4-s390x.ko
+license:        GPL
+description:    Fourth Extended Filesystem
+author:         Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others
+srcversion:     670806A855D5836BE150B41
+depends:        mbcache,jbd2
+vermagic:       2.6.32-220.el6.s390x SMP mod_unload modversions 
+filename:       /ext4-x86_64.ko
+license:        GPL
+description:    Fourth Extended Filesystem
+author:         Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others
+srcversion:     A80608676B83D55514B450E
+depends:        mbcache,jbd2
+vermagic:       2.6.32-220.el6.x86_64 SMP mod_unload modversions 

diff --git a/testsuite/rootfs-pristine/test-init/ext4-i686.ko b/testsuite/rootfs-pristine/test-init/ext4-i686.ko
new file mode 100644 (file)
index 0000000..e5d2fb7
Binary files /dev/null and b/testsuite/rootfs-pristine/test-init/ext4-i686.ko differ

diff --git a/testsuite/rootfs-pristine/test-init/ext4-ppc64.ko b/testsuite/rootfs-pristine/test-init/ext4-ppc64.ko
new file mode 100644 (file)
index 0000000..cb02ed4
Binary files /dev/null and b/testsuite/rootfs-pristine/test-init/ext4-ppc64.ko differ

diff --git a/testsuite/rootfs-pristine/test-init/ext4-s390x.ko b/testsuite/rootfs-pristine/test-init/ext4-s390x.ko
new file mode 100644 (file)
index 0000000..74c3799
Binary files /dev/null and b/testsuite/rootfs-pristine/test-init/ext4-s390x.ko differ

diff --git a/testsuite/rootfs-pristine/test-init/ext4-x86_64.ko b/testsuite/rootfs-pristine/test-init/ext4-x86_64.ko
new file mode 100644 (file)
index 0000000..ae96eef
Binary files /dev/null and b/testsuite/rootfs-pristine/test-init/ext4-x86_64.ko differ

diff --git a/testsuite/rootfs-pristine/test-remove/correct.txt b/testsuite/rootfs-pristine/test-remove/correct.txt
new file mode 100644 (file)
index 0000000..1682154
--- /dev/null
+++ b/testsuite/rootfs-pristine/test-remove/correct.txt
@@ -0,0 +1,28 @@
+filename:       /ext4-i686.ko
+license:        GPL
+description:    Fourth Extended Filesystem
+author:         Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others
+srcversion:     A80608676B83D55514B450E
+depends:        mbcache,jbd2
+vermagic:       2.6.32-220.el6.i686 SMP mod_unload modversions 686 
+filename:       /ext4-ppc64.ko
+license:        GPL
+description:    Fourth Extended Filesystem
+author:         Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others
+srcversion:     670806A855D5836BE150B41
+depends:        jbd2,mbcache
+vermagic:       2.6.32-220.el6.ppc64 SMP mod_unload modversions 
+filename:       /ext4-s390x.ko
+license:        GPL
+description:    Fourth Extended Filesystem
+author:         Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others
+srcversion:     670806A855D5836BE150B41
+depends:        mbcache,jbd2
+vermagic:       2.6.32-220.el6.s390x SMP mod_unload modversions 
+filename:       /ext4-x86_64.ko
+license:        GPL
+description:    Fourth Extended Filesystem
+author:         Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others
+srcversion:     A80608676B83D55514B450E
+depends:        mbcache,jbd2
+vermagic:       2.6.32-220.el6.x86_64 SMP mod_unload modversions 

diff --git a/testsuite/rootfs-pristine/test-remove/ext4-i686.ko b/testsuite/rootfs-pristine/test-remove/ext4-i686.ko
new file mode 100644 (file)
index 0000000..e5d2fb7
Binary files /dev/null and b/testsuite/rootfs-pristine/test-remove/ext4-i686.ko differ

diff --git a/testsuite/rootfs-pristine/test-remove/ext4-ppc64.ko b/testsuite/rootfs-pristine/test-remove/ext4-ppc64.ko
new file mode 100644 (file)
index 0000000..cb02ed4
Binary files /dev/null and b/testsuite/rootfs-pristine/test-remove/ext4-ppc64.ko differ

diff --git a/testsuite/rootfs-pristine/test-remove/ext4-s390x.ko b/testsuite/rootfs-pristine/test-remove/ext4-s390x.ko
new file mode 100644 (file)
index 0000000..74c3799
Binary files /dev/null and b/testsuite/rootfs-pristine/test-remove/ext4-s390x.ko differ

diff --git a/testsuite/rootfs-pristine/test-remove/ext4-x86_64.ko b/testsuite/rootfs-pristine/test-remove/ext4-x86_64.ko
new file mode 100644 (file)
index 0000000..ae96eef
Binary files /dev/null and b/testsuite/rootfs-pristine/test-remove/ext4-x86_64.ko differ

diff --git a/testsuite/test-init.c b/testsuite/test-init.c
index f09c4d21377ca12d2c3a9d233e65d3af47113708..888ac13ccac6ea7585322319368505526a05f16a 100644 (file)
--- a/testsuite/test-init.c
+++ b/testsuite/test-init.c
@@ -70,7 +70,7 @@ static __noreturn int test_insert(const struct test *t)
 static DEFINE_TEST(test_insert,
        .description = "test if libkmod's insert_module returns ok",
        .config = {
-               [TC_ROOTFS] = TESTSUITE_ROOTFS "test-modinfo/",
+               [TC_ROOTFS] = TESTSUITE_ROOTFS "test-init/",
                [TC_INIT_MODULE_RETCODES] = "bla:1:20",
        },
        .need_spawn = true);
@@ -104,7 +104,7 @@ static __noreturn int test_remove(const struct test *t)
 static DEFINE_TEST(test_remove,
        .description = "test if libkmod's remove_module returns ok",
        .config = {
-               [TC_ROOTFS] = TESTSUITE_ROOTFS "test-modinfo/",
+               [TC_ROOTFS] = TESTSUITE_ROOTFS "test-remove/",
                [TC_DELETE_MODULE_RETCODES] = "bla:1:20",
        },
        .need_spawn = true);