diff -Nru libtraceevent-1.8.2/debian/changelog libtraceevent-1.8.2/debian/changelog --- libtraceevent-1.8.2/debian/changelog 2024-01-14 23:08:15.000000000 +0100 +++ libtraceevent-1.8.2/debian/changelog 2024-02-26 16:16:56.000000000 +0100 @@ -1,3 +1,11 @@ +libtraceevent (1:1.8.2-1ubuntu11) noble; urgency=medium + + * Build but also run the test suite when building the pkg. (LP: #2055258) + * Run unit test as autopkgtest (LP: #2055258) + * Fix test running on big endian arch (LP: #2055258) + + -- Paul Mars Mon, 26 Feb 2024 16:16:56 +0100 + libtraceevent (1:1.8.2-1) unstable; urgency=medium * New upstream version 1.8.2 diff -Nru libtraceevent-1.8.2/debian/control libtraceevent-1.8.2/debian/control --- libtraceevent-1.8.2/debian/control 2024-01-07 23:19:23.000000000 +0100 +++ libtraceevent-1.8.2/debian/control 2024-02-26 16:16:56.000000000 +0100 @@ -1,6 +1,7 @@ Source: libtraceevent Priority: optional -Maintainer: Sudip Mukherjee +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Sudip Mukherjee Build-Depends: debhelper-compat (= 13), pkg-config, asciidoc, xmlto, source-highlight, libcunit1-dev Standards-Version: 4.6.2 diff -Nru libtraceevent-1.8.2/debian/patches/0001-utest-autopkgtest.patch libtraceevent-1.8.2/debian/patches/0001-utest-autopkgtest.patch --- libtraceevent-1.8.2/debian/patches/0001-utest-autopkgtest.patch 1970-01-01 01:00:00.000000000 +0100 +++ libtraceevent-1.8.2/debian/patches/0001-utest-autopkgtest.patch 2024-02-26 16:16:56.000000000 +0100 @@ -0,0 +1,18 @@ +Description: Run the unitests as autopkgtest +Author: Paul Mars +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libtraceevent/+bug/2051916 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libtraceevent/+bug/2055258 +Last-Update: 2024-03-11 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/Makefile ++++ b/Makefile +@@ -114,7 +114,7 @@ + OBJ = $@ + N = + +-LIBTRACEEVENT_STATIC = $(bdir)/libtraceevent.a ++LIBTRACEEVENT_STATIC ?= $(bdir)/libtraceevent.a + LIBTRACEEVENT_SHARED = $(bdir)/libtraceevent.so.$(EVENT_PARSE_VERSION) + + EP_HEADERS_DIR = $(src)/include/traceevent diff -Nru libtraceevent-1.8.2/debian/patches/0002-fail-unitest-when-test-fail.patch libtraceevent-1.8.2/debian/patches/0002-fail-unitest-when-test-fail.patch --- libtraceevent-1.8.2/debian/patches/0002-fail-unitest-when-test-fail.patch 1970-01-01 01:00:00.000000000 +0100 +++ libtraceevent-1.8.2/debian/patches/0002-fail-unitest-when-test-fail.patch 2024-02-26 16:16:56.000000000 +0100 @@ -0,0 +1,20 @@ +Description: Make sure unitest binary fails when tests fail +Author: Paul Mars +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libtraceevent/+bug/2051916 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libtraceevent/+bug/2055258 +Last-Update: 2024-03-11 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/utest/trace-utest.c ++++ b/utest/trace-utest.c +@@ -81,6 +81,10 @@ + + CU_basic_set_mode(verbose); + CU_basic_run_tests(); ++ int failed_tests = CU_get_number_of_tests_failed(); + CU_cleanup_registry(); ++ if (failed_tests != 0){ ++ return 1; ++ } + return 0; + } diff -Nru libtraceevent-1.8.2/debian/patches/0003-fix-tests-on-big-endian.patch libtraceevent-1.8.2/debian/patches/0003-fix-tests-on-big-endian.patch --- libtraceevent-1.8.2/debian/patches/0003-fix-tests-on-big-endian.patch 1970-01-01 01:00:00.000000000 +0100 +++ libtraceevent-1.8.2/debian/patches/0003-fix-tests-on-big-endian.patch 2024-02-26 16:16:56.000000000 +0100 @@ -0,0 +1,28 @@ +Description: Fix test running on big endian arch +Author: Mate Kukri +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libtraceevent/+bug/2055258 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libtraceevent/+bug/2051916 +Last-Update: 2024-03-11 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/utest/traceevent-utest.c ++++ b/utest/traceevent-utest.c +@@ -216,7 +216,7 @@ + #define CPUMASK_BYTEP2_FMT "cpumask=0,23" + + DECL_CPUMASK_EVENT_DATA(bytepn, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01); +-#define CPUMASK_BYTEPN "ARRAY[80, 00, 00, 00, 00, 00, 80, 01]" ++#define CPUMASK_BYTEPN "ARRAY[80, 00, 00, 00, 00, 00, 00, 01]" + #define CPUMASK_BYTEPN_FMT "cpumask=0,63" + #endif + +@@ -392,6 +392,9 @@ + test_tep = tep_alloc(); + if (!test_tep) + return 1; ++#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ ++ tep_set_file_bigendian(test_tep, TEP_BIG_ENDIAN); ++#endif + return 0; + } + diff -Nru libtraceevent-1.8.2/debian/patches/series libtraceevent-1.8.2/debian/patches/series --- libtraceevent-1.8.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ libtraceevent-1.8.2/debian/patches/series 2024-02-26 16:16:56.000000000 +0100 @@ -0,0 +1,3 @@ +0001-utest-autopkgtest.patch +0002-fail-unitest-when-test-fail.patch +0003-fix-tests-on-big-endian.patch diff -Nru libtraceevent-1.8.2/debian/rules libtraceevent-1.8.2/debian/rules --- libtraceevent-1.8.2/debian/rules 2024-01-07 23:19:23.000000000 +0100 +++ libtraceevent-1.8.2/debian/rules 2024-02-26 16:16:56.000000000 +0100 @@ -18,3 +18,6 @@ override_dh_auto_install: dh_auto_install -- doc-install $(build_flags) + +execute_after_dh_auto_test: + ./utest/trace-utest \ No newline at end of file diff -Nru libtraceevent-1.8.2/debian/tests/control libtraceevent-1.8.2/debian/tests/control --- libtraceevent-1.8.2/debian/tests/control 2024-01-07 23:19:23.000000000 +0100 +++ libtraceevent-1.8.2/debian/tests/control 2024-02-26 16:16:56.000000000 +0100 @@ -1,3 +1,6 @@ Tests: build-examples.sh Depends: @, @builddeps@ Restrictions: superficial + +Tests: utest +Depends: @, @builddeps@ diff -Nru libtraceevent-1.8.2/debian/tests/utest libtraceevent-1.8.2/debian/tests/utest --- libtraceevent-1.8.2/debian/tests/utest 1970-01-01 01:00:00.000000000 +0100 +++ libtraceevent-1.8.2/debian/tests/utest 2024-02-26 16:16:56.000000000 +0100 @@ -0,0 +1,4 @@ +#!/bin/bash + +LIBTRACEEVENT_STATIC=$(dpkg -L libtraceevent-dev | grep libtraceevent.so) make test +./utest/trace-utest