Hi again

I noticed that debci is failing:

https://ci.debian.net/packages/r/resolv-wrapper/

That may have masked that Ubuntu's resolv-wrapper binary package is not
working:

https://bugs.launchpad.net/ubuntu/+source/resolv-wrapper/+bug/2015570

If debci was working, I think they would have noticed that problem.

Btw, I confirmed that the Debian 12 binary package of resolv-wrapper is
working, so that appears to be a strict Ubuntu problem.

The attached patch fixes debci for resolv-wrapper, on top of the
previous one (but without the changelog part it should apply on top of
1.1.8-1).

/Simon
From 6409d3a211917613746adc5708cd8daefa96c093 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <si...@josefsson.org>
Date: Sun, 6 Aug 2023 11:13:58 +0200
Subject: [PATCH] tests: Fix debci failure.  Add libsocket-wrapper dependency.

---
 debian/changelog     | 1 +
 debian/tests/control | 1 +
 debian/tests/tests   | 7 +++----
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8d731d6..10bc370 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ resolv-wrapper (1.1.8-2) unstable; urgency=medium
   * Drop versioned constraint on cmake and
     libcmocka-dev (unnecessary since buster).
   * Rebuild manpage with asciidoctor since upstream uses that.
+  * tests: Fix debci failure.  Add libsocket-wrapper dependency.
 
  -- Simon Josefsson <si...@josefsson.org>  Sun, 06 Aug 2023 10:19:30 +0200
 
diff --git a/debian/tests/control b/debian/tests/control
index 07bccd7..76e39b7 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,6 +3,7 @@ Depends: libresolv-wrapper,
  build-essential,
  cmake (>= 2.8.8-3~),
  libcmocka-dev (>= 0.4.1),
+ libsocket-wrapper
 Restrictions: allow-stderr
 
 Tests: adequate
diff --git a/debian/tests/tests b/debian/tests/tests
index b51065e..b4a4900 100755
--- a/debian/tests/tests
+++ b/debian/tests/tests
@@ -5,9 +5,8 @@ cd "$AUTOPKGTEST_TMP"
 rm -rf obj debian
 mkdir obj
 cd obj
-cmake .. -DUNIT_TESTING=1
+cmake -DUNIT_TESTING=1 ..
 make -C tests/
 cd tests
-export LD_PRELOAD=libresolv_wrapper.so
-ls ./test_* \
-| xargs -t -d '\n' -n1 env
+sed -e 's#\(LD_PRELOAD=\)[^;]*/\(libresolv_wrapper.so\)#\1\2#' -i CTestTestfile.cmake
+make test ARGS="--output-on-failure"
-- 
2.34.1

Attachment: signature.asc
Description: PGP signature

Reply via email to