On Wed, Jun 01, 2016 at 02:26:14PM +0100, Steve McIntyre wrote:
>
>I never did get around to working out the last few test case failures
>with 4.11 on s390x, so I'm happy with 4.12 I won't have to! :-)
Minor tweaks from the Debian side for 4.12:
* I've dropped the libunwind option from the build for now on amd64,
as it caused issues with the strace udeb that we provide for use in
debian-installer development (#826223).
* The strace -S test fails when building/running using a 32-bit
userspace and a 64-bit kernel - the output includes both 64-bit and
32-bit tracing which confuses the test. I have a hacky fix.
* I've tweaked the package build to always run make check with
VERBOSE=1 to make failures more useful in the build log.
--
Steve McIntyre, Cambridge, UK. st...@einval.com
Can't keep my eyes from the circling sky,
Tongue-tied & twisted, Just an earth-bound misfit, I...
diff -Nru strace-4.12/debian/changelog strace-4.12/debian/changelog
--- strace-4.12/debian/changelog 2016-06-03 00:18:17.000000000 +0100
+++ strace-4.12/debian/changelog 2016-06-04 02:52:43.000000000 +0100
@@ -1,3 +1,16 @@
+strace (4.12-3) unstable; urgency=medium
+
+ * Fix up 32/64-bit test output in strace -S test to fix i386 build
+ * Run make check with VERBOSE=1so we get useful information in build logs
+
+ -- Steve McIntyre <93...@debian.org> Sat, 04 Jun 2016 02:37:44 +0100
+
+strace (4.12-2) unstable; urgency=medium
+
+ * Remove libunwind dependency. Closes: #826223
+
+ -- Steve McIntyre <93...@debian.org> Fri, 03 Jun 2016 13:43:44 +0100
+
strace (4.12-1) unstable; urgency=low
[ Dmitry V. Levin ]
diff -Nru strace-4.12/debian/control strace-4.12/debian/control
--- strace-4.12/debian/control 2016-06-03 00:17:07.000000000 +0100
+++ strace-4.12/debian/control 2016-06-03 13:43:27.000000000 +0100
@@ -2,7 +2,7 @@
Maintainer: Steve McIntyre <93...@debian.org>
Section: utils
Priority: optional
-Build-Depends: libc6-dev (>= 2.2.2) [!alpha !ia64], libc6.1-dev (>= 2.2.2) [alpha ia64], gcc-multilib [i386 powerpc s390 sparc], debhelper (>= 7.0.0), gawk, libunwind-dev [amd64]
+Build-Depends: libc6-dev (>= 2.2.2) [!alpha !ia64], libc6.1-dev (>= 2.2.2) [alpha ia64], gcc-multilib [i386 powerpc s390 sparc], debhelper (>= 7.0.0), gawk
Standards-Version: 3.9.6
Homepage: http://sourceforge.net/projects/strace/
diff -Nru strace-4.12/debian/patches/fix-strace-S-32bit-test.patch strace-4.12/debian/patches/fix-strace-S-32bit-test.patch
--- strace-4.12/debian/patches/fix-strace-S-32bit-test.patch 1970-01-01 01:00:00.000000000 +0100
+++ strace-4.12/debian/patches/fix-strace-S-32bit-test.patch 2016-06-04 02:41:23.000000000 +0100
@@ -0,0 +1,23 @@
+ * Fix up 32/64-bit test output in strace -S test to fix i386 build
+Author: Steve McIntyre <93...@debian.org>
+
+--- strace-4.12.orig/tests/strace-S.test
++++ strace-4.12/tests/strace-S.test
+@@ -14,7 +14,16 @@ test_c()
+ sedexpr="$1"; shift
+
+ run_strace -c -S "$sortby" date > /dev/null
+- sed -ne "$sedexpr" < "$LOG" > "$OUT"
++
++ # If we're using a 64-bit binary with linux32 then we'll see
++ # two sets of stats. Drop the first (64-bit) one
++ if (grep -q '32 bit mode:' "$LOG") ; then
++ awk '/.*/ { if (go) {print $0}};
++ /32 bit mode:/ {go=1}' "$LOG" > "$LOG.32"
++ sed -ne "$sedexpr" < "$LOG.32" > "$OUT"
++ else
++ sed -ne "$sedexpr" < "$LOG" > "$OUT"
++ fi
+
+ [ -s "$OUT" ] ||
+ fail_ "$STRACE $args output mismatch"
diff -Nru strace-4.12/debian/patches/series strace-4.12/debian/patches/series
--- strace-4.12/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ strace-4.12/debian/patches/series 2016-06-04 02:42:02.000000000 +0100
@@ -0,0 +1 @@
+fix-strace-S-32bit-test.patch
diff -Nru strace-4.12/debian/rules strace-4.12/debian/rules
--- strace-4.12/debian/rules 2015-12-20 00:58:36.000000000 +0000
+++ strace-4.12/debian/rules 2016-06-03 18:36:46.000000000 +0100
@@ -47,7 +47,7 @@
%-stamp: %/Makefile
$(MAKE) -C $*
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
- $(MAKE) -C $* check
+ $(MAKE) -C $* check VERBOSE=1
endif
touch $@
------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are
consuming the most bandwidth. Provides multi-vendor support for NetFlow,
J-Flow, sFlow and other flows. Make informed decisions using capacity
planning reports. https://ad.doubleclick.net/ddm/clk/305295220;132659582;e
_______________________________________________
Strace-devel mailing list
Strace-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/strace-devel
