linux-modules.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3 0/3] Fix testsuite without zlib support
@ 2014-04-04 11:18 Michal Marek
  2014-04-04 11:18 ` [PATCH v3 1/3] testsuite: Uncompress most modules Michal Marek
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Michal Marek @ 2014-04-04 11:18 UTC (permalink / raw)
  To: linux-modules

Hi,

here is the updated series. To avoid sending too big patch 1/3, I pushed
the branch got git.kernel.org:

The following changes since commit 8240333b257e96e7dc2ac2522f8bb7fb2158fafc:

  config: also parse softdeps from modules (2014-04-01 08:13:54 -0300)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kmod.git testsuite-nocompression3

for you to fetch changes up to 9324bb52f30cb6d0ff2828e1a63056d9c78960a1:

  testsuite: Warn if sysconfdir is not /etc (2014-04-04 13:06:05 +0200)


Michal Marek (3):
  testsuite: Uncompress most modules
  testsuite: Do not run tests with *.ko.gz if zlib is not enabled
  testsuite: Warn if sysconfdir is not /etc

 Makefile.am                                            |   9 ++++++++-
 .../lib/modules/4.4.4/correct-modules.dep              |   2 +-
 .../lib/modules/4.4.4/foo/md5.ko                       | Bin 0 -> 6391 bytes
 .../lib/modules/4.4.4/foo/md5.ko.gz                    | Bin 1918 -> 0 bytes
 .../lib/modules/4.4.4/foobar/md5.ko                    | Bin 0 -> 6391 bytes
 .../lib/modules/4.4.4/foobar/md5.ko.gz                 | Bin 1918 -> 0 bytes
 .../lib/modules/4.4.4/correct-modules.dep              |   2 +-
 .../lib/modules/4.4.4/foo/md5.ko                       | Bin 0 -> 6391 bytes
 .../lib/modules/4.4.4/foo/md5.ko.gz                    | Bin 1918 -> 0 bytes
 .../lib/modules/4.4.4/foobar/md5.ko                    | Bin 0 -> 6391 bytes
 .../lib/modules/4.4.4/foobar/md5.ko.gz                 | Bin 1918 -> 0 bytes
 .../lib/modules/4.4.4/correct-modules.dep              |   2 +-
 .../lib/modules/4.4.4/kernel/crypto/md5.ko             | Bin 0 -> 6391 bytes
 .../lib/modules/4.4.4/kernel/crypto/md5.ko.gz          | Bin 1918 -> 0 bytes
 .../lib/modules/4.4.4/updates/md5.ko                   | Bin 0 -> 6391 bytes
 .../lib/modules/4.4.4/updates/md5.ko.gz                | Bin 1918 -> 0 bytes
 .../lib/modules/4.4.4/kernel/sound/core/snd-pcm.ko     | Bin 0 -> 155346 bytes
 .../lib/modules/4.4.4/kernel/sound/core/snd-pcm.ko.gz  | Bin 46263 -> 0 bytes
 .../lib/modules/4.4.4/kernel/sound/core/snd.ko         | Bin 0 -> 131125 bytes
 .../lib/modules/4.4.4/kernel/sound/core/snd.ko.gz      | Bin 38351 -> 0 bytes
 .../install-cmd-loop/lib/modules/4.4.4/modules.dep     |   4 ++--
 .../install-cmd-loop/lib/modules/4.4.4/modules.dep.bin | Bin 137 -> 128 bytes
 .../install-cmd-loop/lib/modules/4.4.4/modules.softdep |   1 -
 testsuite/test-depmod.c                                |   2 ++
 24 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foo/md5.ko
 delete mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foo/md5.ko.gz
 create mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foobar/md5.ko
 delete mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foobar/md5.ko.gz
 create mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foo/md5.ko
 delete mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foo/md5.ko.gz
 create mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foobar/md5.ko
 delete mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foobar/md5.ko.gz
 create mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/kernel/crypto/md5.ko
 delete mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/kernel/crypto/md5.ko.gz
 create mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/updates/md5.ko
 delete mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/updates/md5.ko.gz
 create mode 100644 testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd-pcm.ko
 delete mode 100644 testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd-pcm.ko.gz
 create mode 100644 testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd.ko
 delete mode 100644 testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd.ko.gz

-- 
1.8.4.5


^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH v3 1/3] testsuite: Uncompress most modules
  2014-04-04 11:18 [PATCH v3 0/3] Fix testsuite without zlib support Michal Marek
@ 2014-04-04 11:18 ` Michal Marek
  2014-04-04 11:18 ` [PATCH v3 2/3] testsuite: Do not run tests with *.ko.gz if zlib is not enabled Michal Marek
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Michal Marek @ 2014-04-04 11:18 UTC (permalink / raw)
  To: linux-modules

Only keep test-depmod/modules-order-compressed to test compressed module
support.
---
 .../lib/modules/4.4.4/correct-modules.dep              |   2 +-
 .../lib/modules/4.4.4/foo/md5.ko                       | Bin 0 -> 6391 bytes
 .../lib/modules/4.4.4/foo/md5.ko.gz                    | Bin 1918 -> 0 bytes
 .../lib/modules/4.4.4/foobar/md5.ko                    | Bin 0 -> 6391 bytes
 .../lib/modules/4.4.4/foobar/md5.ko.gz                 | Bin 1918 -> 0 bytes
 .../lib/modules/4.4.4/correct-modules.dep              |   2 +-
 .../lib/modules/4.4.4/foo/md5.ko                       | Bin 0 -> 6391 bytes
 .../lib/modules/4.4.4/foo/md5.ko.gz                    | Bin 1918 -> 0 bytes
 .../lib/modules/4.4.4/foobar/md5.ko                    | Bin 0 -> 6391 bytes
 .../lib/modules/4.4.4/foobar/md5.ko.gz                 | Bin 1918 -> 0 bytes
 .../lib/modules/4.4.4/correct-modules.dep              |   2 +-
 .../lib/modules/4.4.4/kernel/crypto/md5.ko             | Bin 0 -> 6391 bytes
 .../lib/modules/4.4.4/kernel/crypto/md5.ko.gz          | Bin 1918 -> 0 bytes
 .../lib/modules/4.4.4/updates/md5.ko                   | Bin 0 -> 6391 bytes
 .../lib/modules/4.4.4/updates/md5.ko.gz                | Bin 1918 -> 0 bytes
 .../lib/modules/4.4.4/kernel/sound/core/snd-pcm.ko     | Bin 0 -> 155346 bytes
 .../lib/modules/4.4.4/kernel/sound/core/snd-pcm.ko.gz  | Bin 46263 -> 0 bytes
 .../lib/modules/4.4.4/kernel/sound/core/snd.ko         | Bin 0 -> 131125 bytes
 .../lib/modules/4.4.4/kernel/sound/core/snd.ko.gz      | Bin 38351 -> 0 bytes
 .../install-cmd-loop/lib/modules/4.4.4/modules.dep     |   4 ++--
 .../install-cmd-loop/lib/modules/4.4.4/modules.dep.bin | Bin 137 -> 128 bytes
 .../install-cmd-loop/lib/modules/4.4.4/modules.softdep |   1 -
 22 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foo/md5.ko
 delete mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foo/md5.ko.gz
 create mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foobar/md5.ko
 delete mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foobar/md5.ko.gz
 create mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foo/md5.ko
 delete mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foo/md5.ko.gz
 create mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foobar/md5.ko
 delete mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foobar/md5.ko.gz
 create mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/kernel/crypto/md5.ko
 delete mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/kernel/crypto/md5.ko.gz
 create mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/updates/md5.ko
 delete mode 100644 testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/updates/md5.ko.gz
 create mode 100644 testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd-pcm.ko
 delete mode 100644 testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd-pcm.ko.gz
 create mode 100644 testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd.ko
 delete mode 100644 testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd.ko.gz

diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/correct-modules.dep b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/correct-modules.dep
index 7cac981..a2f216d 100644
--- a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/correct-modules.dep
+++ b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/correct-modules.dep
@@ -1 +1 @@
-foobar/md5.ko.gz:
+foobar/md5.ko:
diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foo/md5.ko b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foo/md5.ko
new file mode 100644
index 0000000..b568f47
Binary files /dev/null and b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foo/md5.ko differ
diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foo/md5.ko.gz b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foo/md5.ko.gz
deleted file mode 100644
index cf5ab6d..0000000
Binary files a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foo/md5.ko.gz and /dev/null differ
diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foobar/md5.ko b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foobar/md5.ko
new file mode 100644
index 0000000..b568f47
Binary files /dev/null and b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foobar/md5.ko differ
diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foobar/md5.ko.gz b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foobar/md5.ko.gz
deleted file mode 100644
index cf5ab6d..0000000
Binary files a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix/lib/modules/4.4.4/foobar/md5.ko.gz and /dev/null differ
diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/correct-modules.dep b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/correct-modules.dep
index 346a257..32f0d2a 100644
--- a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/correct-modules.dep
+++ b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/correct-modules.dep
@@ -1 +1 @@
-foo/md5.ko.gz:
+foo/md5.ko:
diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foo/md5.ko b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foo/md5.ko
new file mode 100644
index 0000000..b568f47
Binary files /dev/null and b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foo/md5.ko differ
diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foo/md5.ko.gz b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foo/md5.ko.gz
deleted file mode 100644
index cf5ab6d..0000000
Binary files a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foo/md5.ko.gz and /dev/null differ
diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foobar/md5.ko b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foobar/md5.ko
new file mode 100644
index 0000000..b568f47
Binary files /dev/null and b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foobar/md5.ko differ
diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foobar/md5.ko.gz b/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foobar/md5.ko.gz
deleted file mode 100644
index cf5ab6d..0000000
Binary files a/testsuite/rootfs-pristine/test-depmod/search-order-same-prefix2/lib/modules/4.4.4/foobar/md5.ko.gz and /dev/null differ
diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/correct-modules.dep b/testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/correct-modules.dep
index d099dd0..3386e87 100644
--- a/testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/correct-modules.dep
+++ b/testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/correct-modules.dep
@@ -1 +1 @@
-updates/md5.ko.gz:
+updates/md5.ko:
diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/kernel/crypto/md5.ko b/testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/kernel/crypto/md5.ko
new file mode 100644
index 0000000..b568f47
Binary files /dev/null and b/testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/kernel/crypto/md5.ko differ
diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/kernel/crypto/md5.ko.gz b/testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/kernel/crypto/md5.ko.gz
deleted file mode 100644
index cf5ab6d..0000000
Binary files a/testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/kernel/crypto/md5.ko.gz and /dev/null differ
diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/updates/md5.ko b/testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/updates/md5.ko
new file mode 100644
index 0000000..b568f47
Binary files /dev/null and b/testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/updates/md5.ko differ
diff --git a/testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/updates/md5.ko.gz b/testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/updates/md5.ko.gz
deleted file mode 100644
index cf5ab6d..0000000
Binary files a/testsuite/rootfs-pristine/test-depmod/search-order-simple/lib/modules/4.4.4/updates/md5.ko.gz and /dev/null differ
diff --git a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd-pcm.ko b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd-pcm.ko
new file mode 100644
index 0000000..4a1dfd1
Binary files /dev/null and b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd-pcm.ko differ
diff --git a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd-pcm.ko.gz b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd-pcm.ko.gz
deleted file mode 100644
index b149c6a..0000000
Binary files a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd-pcm.ko.gz and /dev/null differ
diff --git a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd.ko b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd.ko
new file mode 100644
index 0000000..cde0e7f
Binary files /dev/null and b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd.ko differ
diff --git a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd.ko.gz b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd.ko.gz
deleted file mode 100644
index c7c671d..0000000
Binary files a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/kernel/sound/core/snd.ko.gz and /dev/null differ
diff --git a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.dep b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.dep
index 518aa59..9203858 100644
--- a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.dep
+++ b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.dep
@@ -1,2 +1,2 @@
-kernel/sound/core/snd.ko.gz:
-kernel/sound/core/snd-pcm.ko.gz: kernel/sound/core/snd.ko.gz
+kernel/sound/core/snd.ko:
+kernel/sound/core/snd-pcm.ko: kernel/sound/core/snd.ko
diff --git a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.dep.bin b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.dep.bin
index 877ae7b..5a4270a 100644
Binary files a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.dep.bin and b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.dep.bin differ
diff --git a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.softdep b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.softdep
index 3cc0512..5554ccc 100644
--- a/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.softdep
+++ b/testsuite/rootfs-pristine/test-modprobe/install-cmd-loop/lib/modules/4.4.4/modules.softdep
@@ -1,2 +1 @@
 # Soft dependencies extracted from modules themselves.
-# Copy, with a .conf extension, to /etc/modprobe.d to use it with modprobe.
-- 
1.8.4.5


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH v3 2/3] testsuite: Do not run tests with *.ko.gz if zlib is not enabled
  2014-04-04 11:18 [PATCH v3 0/3] Fix testsuite without zlib support Michal Marek
  2014-04-04 11:18 ` [PATCH v3 1/3] testsuite: Uncompress most modules Michal Marek
@ 2014-04-04 11:18 ` Michal Marek
  2014-04-04 11:18 ` [PATCH v3 3/3] testsuite: Warn if sysconfdir is not /etc Michal Marek
  2014-04-04 11:40 ` [PATCH v3 0/3] Fix testsuite without zlib support Lucas De Marchi
  3 siblings, 0 replies; 5+ messages in thread
From: Michal Marek @ 2014-04-04 11:18 UTC (permalink / raw)
  To: linux-modules

---
 testsuite/test-depmod.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/testsuite/test-depmod.c b/testsuite/test-depmod.c
index b6023f1..25c2e9b 100644
--- a/testsuite/test-depmod.c
+++ b/testsuite/test-depmod.c
@@ -135,7 +135,9 @@ static DEFINE_TEST(depmod_search_order_same_prefix2,
 
 
 static const struct test *tests[] = {
+#ifdef ENABLE_ZLIB
 	&sdepmod_modules_order_for_compressed,
+#endif
 	&sdepmod_search_order_simple,
 	&sdepmod_search_order_same_prefix,
 	&sdepmod_search_order_same_prefix2,
-- 
1.8.4.5


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH v3 3/3] testsuite: Warn if sysconfdir is not /etc
  2014-04-04 11:18 [PATCH v3 0/3] Fix testsuite without zlib support Michal Marek
  2014-04-04 11:18 ` [PATCH v3 1/3] testsuite: Uncompress most modules Michal Marek
  2014-04-04 11:18 ` [PATCH v3 2/3] testsuite: Do not run tests with *.ko.gz if zlib is not enabled Michal Marek
@ 2014-04-04 11:18 ` Michal Marek
  2014-04-04 11:40 ` [PATCH v3 0/3] Fix testsuite without zlib support Lucas De Marchi
  3 siblings, 0 replies; 5+ messages in thread
From: Michal Marek @ 2014-04-04 11:18 UTC (permalink / raw)
  To: linux-modules

---
 Makefile.am | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index e65fdfb..199588c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -213,7 +213,14 @@ TESTSUITE_OVERRIDE_LIBS = testsuite/uname.la testsuite/path.la \
 TESTSUITE_OVERRIDE_LIBS_LDFLAGS = avoid-version -module -shared -export-dynamic \
 				  -rpath /nowhere -ldl
 
-check-am: rootfs
+check-sysconfdir:
+	$(AM_V_at)if test "$(sysconfdir)" != "/etc" -a "$(sysconfdir)" != "/etc/"; then \
+		echo "warning: Some tests will fail without --sysconfdir=/etc" >&2; \
+	fi
+.PHONY: check-sysconfdir
+
+check-am: rootfs check-sysconfdir
+
 
 check_LTLIBRARIES = $(TESTSUITE_OVERRIDE_LIBS)
 
-- 
1.8.4.5


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH v3 0/3] Fix testsuite without zlib support
  2014-04-04 11:18 [PATCH v3 0/3] Fix testsuite without zlib support Michal Marek
                   ` (2 preceding siblings ...)
  2014-04-04 11:18 ` [PATCH v3 3/3] testsuite: Warn if sysconfdir is not /etc Michal Marek
@ 2014-04-04 11:40 ` Lucas De Marchi
  3 siblings, 0 replies; 5+ messages in thread
From: Lucas De Marchi @ 2014-04-04 11:40 UTC (permalink / raw)
  To: Michal Marek; +Cc: linux-modules

On Fri, Apr 4, 2014 at 8:18 AM, Michal Marek <mmarek@suse.cz> wrote:
> Hi,
>
> here is the updated series. To avoid sending too big patch 1/3, I pushed
> the branch got git.kernel.org:
>
> The following changes since commit 8240333b257e96e7dc2ac2522f8bb7fb2158fafc:
>
>   config: also parse softdeps from modules (2014-04-01 08:13:54 -0300)
>
> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kmod.git testsuite-nocompression3
>
> for you to fetch changes up to 9324bb52f30cb6d0ff2828e1a63056d9c78960a1:
>
>   testsuite: Warn if sysconfdir is not /etc (2014-04-04 13:06:05 +0200)
>
>
> Michal Marek (3):
>   testsuite: Uncompress most modules
>   testsuite: Do not run tests with *.ko.gz if zlib is not enabled
>   testsuite: Warn if sysconfdir is not /etc

I`ve applied all of them.

Thanks.
Lucas De Marchi

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-04-04 11:40 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-04 11:18 [PATCH v3 0/3] Fix testsuite without zlib support Michal Marek
2014-04-04 11:18 ` [PATCH v3 1/3] testsuite: Uncompress most modules Michal Marek
2014-04-04 11:18 ` [PATCH v3 2/3] testsuite: Do not run tests with *.ko.gz if zlib is not enabled Michal Marek
2014-04-04 11:18 ` [PATCH v3 3/3] testsuite: Warn if sysconfdir is not /etc Michal Marek
2014-04-04 11:40 ` [PATCH v3 0/3] Fix testsuite without zlib support Lucas De Marchi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).