diff options
author | Dan McGee <dan@archlinux.org> | 2012-02-03 13:24:18 -0600 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2012-02-06 22:18:08 -0600 |
commit | 09e9b2b2fd01bf5b41594429e42dee82ba39a741 (patch) | |
tree | 00df4124a4deaf9a328750e2373fb25792562660 | |
parent | 8cf5938c06c7bccae12ef96096e9ff3bb59ce497 (diff) | |
download | kmod-09e9b2b2fd01bf5b41594429e42dee82ba39a741.tar.gz kmod-09e9b2b2fd01bf5b41594429e42dee82ba39a741.zip |
testsuite: ship testsuite/rootfs unzipped
The current configuration is dumb in any number of ways:
1) If the rationale was for space savings, it works the opposite- the
git repo gets more bloated because we are adding binary compressed
blobs that share little in common with their parent, and anyone that
wants to run the test suite has to unzip it anyway.
2) It is a pain in the butt to add new tests, and not accidentally lose
any new rootfs you built in the directory.
3) `git status` won't help you if you are tweaking files in the rootfs
and don't know they have been changed, or if some test did that and
you couldn't detect it.
4) `git log` won't help you find out what is changing in the rootfs test
directory itself when changes are made to the binary blob, such as
new files being added or even existing files being tweaked.
5) The files just aren't that big anyway- 2.7MB unzipped.
Signed-off-by: Dan McGee <dan@archlinux.org>
43 files changed, 91 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index c3eb225..6c7b238 100644 --- a/Makefile.am +++ b/Makefile.am @@ -133,10 +133,6 @@ endif # TESTSUITE # ------------------------------------------------------------------------------ -testsuite/rootfs: $(top_srcdir)/testsuite/rootfs.tar.xz - $(AM_V_GEN) tar -C testsuite/ \ - -xJf $(top_srcdir)/testsuite/rootfs.tar.xz - TESTSUITE_OVERRIDE_LIBS = testsuite/uname.la testsuite/path.la \ testsuite/init_module.la \ testsuite/delete_module.la @@ -154,12 +150,6 @@ testsuite_init_module_la_SOURCES = testsuite/init_module.c \ testsuite/stripped-module.h testsuite_init_module_la_LIBADD = libkmod/libkmod-private.la -testsuite-distclean: - -rm -rf testsuite/rootfs - -DISTCLEAN_LOCAL_HOOKS += testsuite-distclean -EXTRA_DIST += testsuite/rootfs.tar.xz - TESTSUITE_CPPFLAGS = $(AM_CPPFLAGS) \ -DTESTSUITE_ROOTFS=\"$(abs_top_builddir)/testsuite/rootfs/\" \ -DABS_TOP_BUILDDIR=\"$(abs_top_builddir)\" diff --git a/testsuite/.gitignore b/testsuite/.gitignore index aed91bb..ec3a77d 100644 --- a/testsuite/.gitignore +++ b/testsuite/.gitignore @@ -2,7 +2,6 @@ *.la *.so /.dirstamp -/rootfs/ /test-alias /test-init /test-loaded diff --git a/testsuite/rootfs.tar.xz b/testsuite/rootfs.tar.xz Binary files differdeleted file mode 100644 index fa92e20..0000000 --- a/testsuite/rootfs.tar.xz +++ /dev/null diff --git a/testsuite/rootfs/test-alias/correct.txt b/testsuite/rootfs/test-alias/correct.txt new file mode 100644 index 0000000..86d0304 --- /dev/null +++ b/testsuite/rootfs/test-alias/correct.txt @@ -0,0 +1,25 @@ +input test1234 +return 0 +len 8 +output test1234 + +input test[abcfoobar]2211 +return 0 +len 19 +output test[abcfoobar]2211 + +input bar[aaa][bbbb]sss +return 0 +len 17 +output bar[aaa][bbbb]sss + +input kmod[p.b]lib +return 0 +len 12 +output kmod[p.b]lib + +input [az]1234[AZ] +return 0 +len 12 +output [az]1234[AZ] + diff --git a/testsuite/rootfs/test-loaded/correct.txt b/testsuite/rootfs/test-loaded/correct.txt new file mode 100644 index 0000000..71c5f7f --- /dev/null +++ b/testsuite/rootfs/test-loaded/correct.txt @@ -0,0 +1,2 @@ +Module Size Used by +btusb 11216 0 diff --git a/testsuite/rootfs/test-loaded/proc/modules b/testsuite/rootfs/test-loaded/proc/modules new file mode 100644 index 0000000..ce468c0 --- /dev/null +++ b/testsuite/rootfs/test-loaded/proc/modules @@ -0,0 +1 @@ +btusb 11216 0 - Live 0xffffffffa014a000 diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/drivers/usb:btusb b/testsuite/rootfs/test-loaded/sys/module/btusb/drivers/usb:btusb new file mode 120000 index 0000000..c173837 --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/drivers/usb:btusb @@ -0,0 +1 @@ +../../../bus/usb/drivers/btusb
\ No newline at end of file diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/holders/.gitignore b/testsuite/rootfs/test-loaded/sys/module/btusb/holders/.gitignore new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/holders/.gitignore diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/initstate b/testsuite/rootfs/test-loaded/sys/module/btusb/initstate new file mode 100644 index 0000000..e23fe64 --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/initstate @@ -0,0 +1 @@ +live diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/notes/.note.gnu.build-id b/testsuite/rootfs/test-loaded/sys/module/btusb/notes/.note.gnu.build-id Binary files differnew file mode 100644 index 0000000..0758558 --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/notes/.note.gnu.build-id diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/parameters/disable_scofix b/testsuite/rootfs/test-loaded/sys/module/btusb/parameters/disable_scofix new file mode 100644 index 0000000..d52e798 --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/parameters/disable_scofix @@ -0,0 +1 @@ +N diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/parameters/force_scofix b/testsuite/rootfs/test-loaded/sys/module/btusb/parameters/force_scofix new file mode 100644 index 0000000..d52e798 --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/parameters/force_scofix @@ -0,0 +1 @@ +N diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/parameters/ignore_csr b/testsuite/rootfs/test-loaded/sys/module/btusb/parameters/ignore_csr new file mode 100644 index 0000000..d52e798 --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/parameters/ignore_csr @@ -0,0 +1 @@ +N diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/parameters/ignore_dga b/testsuite/rootfs/test-loaded/sys/module/btusb/parameters/ignore_dga new file mode 100644 index 0000000..d52e798 --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/parameters/ignore_dga @@ -0,0 +1 @@ +N diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/parameters/ignore_sniffer b/testsuite/rootfs/test-loaded/sys/module/btusb/parameters/ignore_sniffer new file mode 100644 index 0000000..d52e798 --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/parameters/ignore_sniffer @@ -0,0 +1 @@ +N diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/parameters/reset b/testsuite/rootfs/test-loaded/sys/module/btusb/parameters/reset new file mode 100644 index 0000000..9bda8c3 --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/parameters/reset @@ -0,0 +1 @@ +Y diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/refcnt b/testsuite/rootfs/test-loaded/sys/module/btusb/refcnt new file mode 100644 index 0000000..573541a --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/refcnt @@ -0,0 +1 @@ +0 diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.bss b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.bss new file mode 100644 index 0000000..e971686 --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.bss @@ -0,0 +1 @@ +0xffffffffa014c828 diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.data b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.data new file mode 100644 index 0000000..5ccfa09 --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.data @@ -0,0 +1 @@ +0xffffffffa014c040 diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.exit.text b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.exit.text new file mode 100644 index 0000000..446df03 --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.exit.text @@ -0,0 +1 @@ +0xffffffffa014bd7c diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.gnu.linkonce.this_module b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.gnu.linkonce.this_module new file mode 100644 index 0000000..f91a8fd --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.gnu.linkonce.this_module @@ -0,0 +1 @@ +0xffffffffa014c600 diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.init.text b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.init.text new file mode 100644 index 0000000..1179bf2 --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.init.text @@ -0,0 +1 @@ +0xffffffffa014e000 diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.note.gnu.build-id b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.note.gnu.build-id new file mode 100644 index 0000000..e08ddab --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.note.gnu.build-id @@ -0,0 +1 @@ +0xffffffffa014bd90 diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.rodata b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.rodata new file mode 100644 index 0000000..327441b --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.rodata @@ -0,0 +1 @@ +0xffffffffa014bfe0 diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.rodata.str1.1 b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.rodata.str1.1 new file mode 100644 index 0000000..e96b658 --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.rodata.str1.1 @@ -0,0 +1 @@ +0xffffffffa014be29 diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.rodata.str1.8 b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.rodata.str1.8 new file mode 100644 index 0000000..d437cbe --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.rodata.str1.8 @@ -0,0 +1 @@ +0xffffffffa014bdb8 diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.smp_locks b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.smp_locks new file mode 100644 index 0000000..955e243 --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.smp_locks @@ -0,0 +1 @@ +0xffffffffa014bea8 diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.strtab b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.strtab new file mode 100644 index 0000000..a874fed --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.strtab @@ -0,0 +1 @@ +0xffffffffa014ede8 diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.symtab b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.symtab new file mode 100644 index 0000000..fafe019 --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.symtab @@ -0,0 +1 @@ +0xffffffffa014e020 diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.text b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.text new file mode 100644 index 0000000..0a967df --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/.text @@ -0,0 +1 @@ +0xffffffffa014a000 diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/sections/__param b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/__param new file mode 100644 index 0000000..9f6710a --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/sections/__param @@ -0,0 +1 @@ +0xffffffffa014bf20 diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/srcversion b/testsuite/rootfs/test-loaded/sys/module/btusb/srcversion new file mode 100644 index 0000000..a688adf --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/srcversion @@ -0,0 +1 @@ +8EEAC35838CCA1118F97F5F diff --git a/testsuite/rootfs/test-loaded/sys/module/btusb/version b/testsuite/rootfs/test-loaded/sys/module/btusb/version new file mode 100644 index 0000000..5a2a580 --- /dev/null +++ b/testsuite/rootfs/test-loaded/sys/module/btusb/version @@ -0,0 +1 @@ +0.6 diff --git a/testsuite/rootfs/test-modinfo/correct.txt b/testsuite/rootfs/test-modinfo/correct.txt new file mode 100644 index 0000000..1682154 --- /dev/null +++ b/testsuite/rootfs/test-modinfo/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/test-modinfo/ext4-i686.ko b/testsuite/rootfs/test-modinfo/ext4-i686.ko Binary files differnew file mode 100644 index 0000000..e5d2fb7 --- /dev/null +++ b/testsuite/rootfs/test-modinfo/ext4-i686.ko diff --git a/testsuite/rootfs/test-modinfo/ext4-ppc64.ko b/testsuite/rootfs/test-modinfo/ext4-ppc64.ko Binary files differnew file mode 100644 index 0000000..cb02ed4 --- /dev/null +++ b/testsuite/rootfs/test-modinfo/ext4-ppc64.ko diff --git a/testsuite/rootfs/test-modinfo/ext4-s390x.ko b/testsuite/rootfs/test-modinfo/ext4-s390x.ko Binary files differnew file mode 100644 index 0000000..74c3799 --- /dev/null +++ b/testsuite/rootfs/test-modinfo/ext4-s390x.ko diff --git a/testsuite/rootfs/test-modinfo/ext4-x86_64.ko b/testsuite/rootfs/test-modinfo/ext4-x86_64.ko Binary files differnew file mode 100644 index 0000000..ae96eef --- /dev/null +++ b/testsuite/rootfs/test-modinfo/ext4-x86_64.ko diff --git a/testsuite/rootfs/test-new-module/from_alias/correct.txt b/testsuite/rootfs/test-new-module/from_alias/correct.txt new file mode 100644 index 0000000..6ed98ea --- /dev/null +++ b/testsuite/rootfs/test-new-module/from_alias/correct.txt @@ -0,0 +1,2 @@ +modname: ext4 + diff --git a/testsuite/rootfs/test-new-module/from_alias/etc/modprobe.d/modprobe.conf b/testsuite/rootfs/test-new-module/from_alias/etc/modprobe.d/modprobe.conf new file mode 100644 index 0000000..f9629a0 --- /dev/null +++ b/testsuite/rootfs/test-new-module/from_alias/etc/modprobe.d/modprobe.conf @@ -0,0 +1 @@ +alias ext4.* ext4 diff --git a/testsuite/rootfs/test-new-module/from_name/correct.txt b/testsuite/rootfs/test-new-module/from_name/correct.txt new file mode 100644 index 0000000..a75cd3b --- /dev/null +++ b/testsuite/rootfs/test-new-module/from_name/correct.txt @@ -0,0 +1,6 @@ +modname: ext4 +modname: balbalbalbbalbalbalbalbalbalbal +modname: snd_hda_intel +modname: snd_timer +modname: iTCO_wdt + diff --git a/testsuite/rootfs/test-rootfs/lib/modules/a b/testsuite/rootfs/test-rootfs/lib/modules/a new file mode 100644 index 0000000..837c960 --- /dev/null +++ b/testsuite/rootfs/test-rootfs/lib/modules/a @@ -0,0 +1 @@ +kmod-test-chroot-works diff --git a/testsuite/rootfs/test-rootfs/testdir/.gitignore b/testsuite/rootfs/test-rootfs/testdir/.gitignore new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/testsuite/rootfs/test-rootfs/testdir/.gitignore |