Source: mtd-utils
Version: 1:2.0.1-1
Tags: patch
Dear Maintainer,
Please enable running unit tests during the build. The tests are
already enabled in Ubuntu in a slightly different way.
The upstream patches are already upstreamed.
Thanks,
Balint
From d09b0ec4a93d71b23c5688c7451f182077dea4f2 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint.rec...@canonical.com>
Date: Tue, 30 Jan 2018 03:16:07 +0100
Subject: [PATCH 1/6] Enable running tests using cherry-picked upstream commit
---
...Run-unit-test-programs-through-make-check.patch | 51 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 52 insertions(+)
create mode 100644 debian/patches/0001-Run-unit-test-programs-through-make-check.patch
create mode 100644 debian/patches/series
diff --git a/debian/patches/0001-Run-unit-test-programs-through-make-check.patch b/debian/patches/0001-Run-unit-test-programs-through-make-check.patch
new file mode 100644
index 0000000..a2b42db
--- /dev/null
+++ b/debian/patches/0001-Run-unit-test-programs-through-make-check.patch
@@ -0,0 +1,51 @@
+From 6766178412934e29db12ff5e6663604c6e909c6e Mon Sep 17 00:00:00 2001
+From: David Oberhollenzer <david.oberhollen...@sigma-star.at>
+Date: Tue, 5 Dec 2017 13:20:54 +0100
+Subject: [PATCH] Run unit test programs through "make check"
+
+Signed-off-by: David Oberhollenzer <david.oberhollen...@sigma-star.at>
+---
+ .gitignore | 3 +++
+ Makefile.am | 2 ++
+ tests/unittests/Makemodule.am | 3 ++-
+ 3 files changed, 7 insertions(+), 1 deletion(-)
+
+--- a/.gitignore
++++ b/.gitignore
+@@ -127,6 +127,9 @@
+ /include/config.h
+ /include/config.h.in
+ /include/stamp-h1
++test-driver
++*.log
++*.trs
+
+ #
+ # Top-level generic files
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,6 +16,7 @@
+
+ sbin_PROGRAMS =
+ sbin_SCRIPTS =
++check_PROGRAMS =
+ noinst_LIBRARIES =
+ noinst_PROGRAMS =
+ noinst_SCRIPTS =
+@@ -24,6 +25,7 @@
+ dist_man1_MANS =
+ dist_man8_MANS =
+
++TESTS =
+ EXTRA_DIST =
+
+ GLOBAL_HEADER = \
+--- a/tests/unittests/Makemodule.am
++++ b/tests/unittests/Makemodule.am
+@@ -20,4 +20,5 @@
+
+ EXTRA_DIST += $(UNITTEST_HEADER) $(UNITTEST_EXTRA)
+
+-noinst_PROGRAMS += $(TEST_BINS)
++TESTS += $(TEST_BINS)
++check_PROGRAMS += $(TEST_BINS)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3f709ed
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Run-unit-test-programs-through-make-check.patch
--
2.14.1
From 6ab2272a7b32ab4f3c75cba9b91f99c43a521799 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint.rec...@canonical.com>
Date: Tue, 30 Jan 2018 03:20:55 +0100
Subject: [PATCH 2/6] Build-depend on libcmocka-dev
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 48fd393..c0c14de 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mtd-utils
Section: utils
Priority: extra
Maintainer: Riku Voipio <riku.voi...@linaro.org>
-Build-Depends: debhelper (>= 9), pkg-config, dh-autoreconf, zlib1g-dev, libacl1-dev, liblzo2-dev, uuid-dev
+Build-Depends: debhelper (>= 9), pkg-config, dh-autoreconf, zlib1g-dev, libacl1-dev, libcmocka-dev <!nocheck>, liblzo2-dev, uuid-dev
Standards-Version: 3.9.8
Homepage: http://www.linux-mtd.infradead.org/
Vcs-Git: https://alioth.debian.org/anonscm/git/collab-maint/mtd-utils.git
--
2.14.1
From 806eefc2b3ef4444fe1deade5625be1d9fc73b96 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint.rec...@canonical.com>
Date: Tue, 6 Feb 2018 05:33:37 +0700
Subject: [PATCH 3/6] Stop testing stat() calls to let tests succeed
---
debian/patches/0002-Stop-testing-stat-calls.patch | 79 +++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 80 insertions(+)
create mode 100644 debian/patches/0002-Stop-testing-stat-calls.patch
diff --git a/debian/patches/0002-Stop-testing-stat-calls.patch b/debian/patches/0002-Stop-testing-stat-calls.patch
new file mode 100644
index 0000000..2181a8a
--- /dev/null
+++ b/debian/patches/0002-Stop-testing-stat-calls.patch
@@ -0,0 +1,79 @@
+From 2de9f76b500319cd07c480a6b82bb4b085ac4ed3 Mon Sep 17 00:00:00 2001
+From: Balint Reczey <balint.rec...@canonical.com>
+Date: Tue, 6 Feb 2018 05:31:32 +0700
+Subject: [PATCH] Stop testing stat() calls
+
+Sometimes __xstat is called instead that makes tests fragile.
+---
+ tests/unittests/Makemodule.am | 2 +-
+ tests/unittests/libmtd_test.c | 2 --
+ tests/unittests/libubi_test.c | 1 -
+ tests/unittests/test_lib.h | 12 ------------
+ 4 files changed, 1 insertion(+), 16 deletions(-)
+
+--- a/tests/unittests/Makemodule.am
++++ b/tests/unittests/Makemodule.am
+@@ -1,6 +1,6 @@
+ ubilib_test_SOURCES = tests/unittests/libubi_test.c lib/libubi.c
+ ubilib_test_LDADD = $(CMOCKA_LIBS)
+-ubilib_test_LDFLAGS = -Wl,--wrap=open -Wl,--wrap=close -Wl,--wrap=stat -Wl,--wrap=ioctl -Wl,--wrap=read -Wl,--wrap=lseek
++ubilib_test_LDFLAGS = -Wl,--wrap=open -Wl,--wrap=close -Wl,--wrap=ioctl -Wl,--wrap=read -Wl,--wrap=lseek
+ ubilib_test_CPPFLAGS = -O0 --std=gnu99 $(CMOCKA_CFLAGS) -I include -DSYSFS_ROOT='"tests/unittests/sysfs_mock"'
+
+ mtdlib_test_SOURCES = tests/unittests/libmtd_test.c lib/libmtd.c lib/libmtd_legacy.c
+--- a/tests/unittests/libmtd_test.c
++++ b/tests/unittests/libmtd_test.c
+@@ -53,7 +53,6 @@
+ {
+ int ret;
+ libmtd_t lib = mock_libmtd_open();
+- expect_stat(SYSFS_ROOT "/class/mtd/mtd0", 0);
+ ret = mtd_dev_present(lib, 0);
+ assert_int_equal(ret, 1);
+ libmtd_close(lib);
+@@ -423,7 +422,6 @@
+ struct mtd_dev_info info;
+ int dev_num = 0;
+ memset(&info, 0, sizeof(info));
+- expect_stat(SYSFS_ROOT "/class/mtd/mtd0", 0);
+ expect_open(SYSFS_ROOT "/class/mtd/mtd0/dev", O_RDONLY, 0);
+ expect_read_real(50,0);
+ expect_read(1,0);
+--- a/tests/unittests/libubi_test.c
++++ b/tests/unittests/libubi_test.c
+@@ -98,7 +98,6 @@
+ static void test_ubi_dev_present(void **state)
+ {
+ libubi_t lib = mock_libubi_open();
+- expect_stat(SYSFS_ROOT "/class/ubi/ubi0", 0);
+ int r = ubi_dev_present(lib, 0);
+ assert_int_equal(r, 1);
+
+--- a/tests/unittests/test_lib.h
++++ b/tests/unittests/test_lib.h
+@@ -58,13 +58,6 @@
+ return retval;
+ }
+
+-int __wrap_stat(const char *path, struct stat *buf)
+-{
+- check_expected(path);
+- assert_non_null(buf);
+- return mock_type(int);
+-}
+-
+ int __wrap_read(int fd, char *buf, size_t len)
+ {
+ assert_true(fd > 0);
+@@ -121,11 +114,6 @@
+ will_return(__wrap_ioctl, 0);\
+ } while(0);
+
+-#define expect_stat(X,Y) do { \
+- expect_string(__wrap_stat, path, X);\
+- will_return(__wrap_stat, Y);\
+- } while(0);
+-
+ #define expect_write(X,Y,Z) do { \
+ will_return(__wrap_write, X);\
+ will_return(__wrap_write, Y);\
diff --git a/debian/patches/series b/debian/patches/series
index 3f709ed..7f45f4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-Run-unit-test-programs-through-make-check.patch
+0002-Stop-testing-stat-calls.patch
--
2.14.1
From d9f4af0c7cd745a39ffbb8258b35051cca33e7d3 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint.rec...@canonical.com>
Date: Wed, 7 Feb 2018 03:53:04 +0700
Subject: [PATCH 4/6] Use proper unsigned long type for ioctl requests in test
wrappers
This fixes FTBFS on s390x
---
...ts-Use-proper-unsigned-long-type-for-ioct.patch | 41 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 42 insertions(+)
create mode 100644 debian/patches/0003-mtd-unittests-Use-proper-unsigned-long-type-for-ioct.patch
diff --git a/debian/patches/0003-mtd-unittests-Use-proper-unsigned-long-type-for-ioct.patch b/debian/patches/0003-mtd-unittests-Use-proper-unsigned-long-type-for-ioct.patch
new file mode 100644
index 0000000..990f618
--- /dev/null
+++ b/debian/patches/0003-mtd-unittests-Use-proper-unsigned-long-type-for-ioct.patch
@@ -0,0 +1,41 @@
+From c374ab8f2f180158aab8c6796fa96c2774ff3197 Mon Sep 17 00:00:00 2001
+From: Balint Reczey <balint.rec...@canonical.com>
+Date: Wed, 7 Feb 2018 03:49:14 +0700
+Subject: [PATCH 1/2] mtd: unittests: Use proper unsigned long type for ioctl
+ requests
+
+This fixes tests on s390x
+
+Signed-off-by: Balint Reczey <balint.rec...@canonical.com>
+---
+ tests/unittests/test_lib.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/tests/unittests/test_lib.h
++++ b/tests/unittests/test_lib.h
+@@ -40,7 +40,7 @@
+ return retval;
+ }
+
+-int __wrap_ioctl(int fd, int req, ...)
++int __wrap_ioctl(int fd, unsigned long req, ...)
+ {
+ assert_true(fd > 0);
+ check_expected(req);
+@@ -101,14 +101,14 @@
+ } while(0);
+
+ #define expect_ioctl(W,X,Y,Z) do { \
+- expect_value(__wrap_ioctl, req, (int)W);\
++ expect_value(__wrap_ioctl, req, W);\
+ will_return(__wrap_ioctl, X);\
+ will_return(__wrap_ioctl, Y);\
+ will_return(__wrap_ioctl, Z);\
+ } while(0);
+
+ #define expect_ioctl_short(X,Y) do { \
+- expect_value(__wrap_ioctl, req, (int)X);\
++ expect_value(__wrap_ioctl, req, X);\
+ will_return(__wrap_ioctl, Y);\
+ will_return(__wrap_ioctl, NULL);\
+ will_return(__wrap_ioctl, 0);\
diff --git a/debian/patches/series b/debian/patches/series
index 7f45f4a..9867f38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-Run-unit-test-programs-through-make-check.patch
0002-Stop-testing-stat-calls.patch
+0003-mtd-unittests-Use-proper-unsigned-long-type-for-ioct.patch
--
2.14.1
From 71282a24e2f7d133ac14711ea8342db67d1f1062 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint.rec...@canonical.com>
Date: Tue, 30 Jan 2018 03:00:13 +0100
Subject: [PATCH 5/6] Enable unit tests
---
debian/rules | 2 ++
1 file changed, 2 insertions(+)
diff --git a/debian/rules b/debian/rules
index 02564aa..0646091 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,3 +2,5 @@
%:
dh $@ --parallel --with autoreconf
+override_dh_auto_configure:
+ dh_auto_configure -- --enable-unit-tests
--
2.14.1
From b4a41595534a9ba23d8e068839934dfe812e3d66 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint.rec...@canonical.com>
Date: Thu, 8 Feb 2018 01:08:33 +0700
Subject: [PATCH 6/6] Ignore test results on ppc64el because cmocka is broken
there
---
debian/rules | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/debian/rules b/debian/rules
index 0646091..ef5f797 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,3 +4,10 @@
override_dh_auto_configure:
dh_auto_configure -- --enable-unit-tests
+
+# ignore test results on ppc64el because cmocka is broken in multiple ways
+# there
+ifeq ($(DEB_HOST_ARCH),ppc64el)
+override_dh_auto_test:
+ -dh_auto_test
+endif
--
2.14.1
