Merge ~lucaskanashiro/ubuntu/+source/libtraceevent:run-test-plus-dep8 into ubuntu/+source/libtraceevent:ubuntu/devel

[Lucas Kanashiro]

This is an effort to promote libtraceevent to main (it is a dependency of libtracefs which is a dependency of ndctl), run the upstream make test during build and also add a DEP-8 test to compile the upstream samples against the installed version of the library.

PPA with the proposed package:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/testing

autopkgtest successfully passed localy:

autopkgtest [18:08:05]: @@@@@@@@@@@@@@@@@@@@ summary
build-examples.sh PASS

And just to confirm, I believe those changes do not require a FFe.

[Lucas Kanashiro (lucaskanashiro)]

FWIW I plan to forward those changes to Debian once this MP is approved.

[Lucas Kanashiro (lucaskanashiro)]

Hum, the build failed in s390x. Needs more investigation.

a092ff4... by Lucas Kanashiro on 2023-03-07

d/patches: add patch to fix make test in big endian architectures

[Lucas Kanashiro (lucaskanashiro)]

The build was fixed on s390x. Up for review again. The added patch still needs to be forwarded to upstream.

[Lucas Kanashiro (lucaskanashiro)]

Patch was forwarded to upstream:

https://lore.kernel<email address hidden>/T/#u

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Lucas.

There's one minor nit with the indentation of build-examples.sh, but otherwise this LGTM. Builds and tests fine locally.

One question I forgot to ask during my review of libtracefs (and that also applies here): do you intend to submit these modifications to the Debian package as well?

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: lucaskanashiro, sergiodj
Uploaders: lucaskanashiro, sergiodj
MP auto-approved

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Thank you Sergio. Fixed the indentation issue. And yes, I'll be forwarding all those changes to Debian.

[Lucas Kanashiro (lucaskanashiro)]

Package uploaded and changes forwarded to Debian:

https://salsa.debian.org/sudip/libtraceevent/-/merge_requests/3

diff --git a/debian/changelog b/debian/changelog
index 367b4fe..a0f150d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libtraceevent (1:1.7.1-1ubuntu1) lunar; urgency=medium
+
+  * Run upstream make test in dh_auto_test.
+    - d/control: add b-d on libcunit1-dev.
+    - d/rules: remove override_dh_auto_test with nothing in it.
+  * d/tests: add DEP-8 test to build samples.
+  * d/patches: add patch to fix make test in big endian architectures.
+
+ -- Lucas Kanashiro <[e-mail]>  Tue, 07 Mar 2023 18:01:11 -0300
+
 libtraceevent (1:1.7.1-1) unstable; urgency=medium
 
   [ Debian Janitor ]
diff --git a/debian/control b/debian/control
index 9aafee5..32ab147 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: libtraceevent
 Priority: optional
-Maintainer: Sudip Mukherjee <[e-mail]>
-Build-Depends: debhelper-compat (= 13), pkg-config, asciidoc, xmlto, source-highlight
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Sudip Mukherjee <[e-mail]>
+Build-Depends: debhelper-compat (= 13), pkg-config, asciidoc, xmlto, source-highlight, libcunit1-dev
 Standards-Version: 4.6.2
 Section: libs
 Vcs-Browser: https://salsa.debian.org/sudip/libtraceevent
diff --git a/debian/patches/0001-utest-traceevent-utest.c-fix-array-definition-in-big.patch b/debian/patches/0001-utest-traceevent-utest.c-fix-array-definition-in-big.patch
new file mode 100644
index 0000000..846bbb2
--- /dev/null
+++ b/debian/patches/0001-utest-traceevent-utest.c-fix-array-definition-in-big.patch
@@ -0,0 +1,42 @@
+From: Lucas Kanashiro <[e-mail]>
+Date: Tue, 7 Mar 2023 19:03:17 -0300
+Subject: utest/traceevent-utest.c: fix array definition in big endian arches
+
+A comma is missing in the definition of the array values.
+
+Forwarded: yes, https://lore.kernel.org/linux-trace-users/[e-mail]/T/#u
+---
+ utest/traceevent-utest.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/utest/traceevent-utest.c b/utest/traceevent-utest.c
+index ebd5eb9..041843e 100644
+--- a/utest/traceevent-utest.c
++++ b/utest/traceevent-utest.c
+@@ -45,7 +45,7 @@ static char dyn_str_data[] = {
+ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+ 	/* common type */		1, 0x00,
+ #else
+-	/* common type */		0x00, 1
++	/* common type */		0x00, 1,
+ #endif
+ 	/* common flags */		0x00,
+ 	/* common_preempt_count */	0x00,
+@@ -82,7 +82,7 @@ static char dyn_str_old_data[] = {
+ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+ 	/* common type */		2, 0x00,
+ #else
+-	/* common type */		0x00, 2
++	/* common type */		0x00, 2,
+ #endif
+ 	/* common flags */		0x00,
+ 	/* common_preempt_count */	0x00,
+@@ -166,7 +166,7 @@ static char sizeof_data[] = {
+ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+ 	/* common type */		23, 0x00,
+ #else
+-	/* common type */		0x00, 23
++	/* common type */		0x00, 23,
+ #endif
+ 	/* common flags */		0x00,
+ 	/* common_preempt_count */	0x00,
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7e18324
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-utest-traceevent-utest.c-fix-array-definition-in-big.patch
diff --git a/debian/rules b/debian/rules
index 99be659..c4c5c94 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,5 +18,3 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	dh_auto_install -- doc-install $(build_flags)
-
-override_dh_auto_test:
diff --git a/debian/tests/build-examples.sh b/debian/tests/build-examples.sh
new file mode 100755
index 0000000..2568752
--- /dev/null
+++ b/debian/tests/build-examples.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+for f in $(ls samples/*.c); do
+	name=$(basename $f .c)
+        flags=$(pkg-config --libs libtraceevent)
+        cflags=$(pkg-config --cflags libtraceevent)
+	
+        cc -o $AUTOPKGTEST_TMP/$name $f $flags $cflags
+        echo "[I] Built example $f"
+done
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..36c9b52
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,3 @@
+Tests: build-examples.sh
+Depends: @, @builddeps@
+Restrictions: superficial