Control: tags -1 patch upstream
The attached debdiff makes the package build cleanly on i386 (also
tested on amd64). It extends upstream's existing code for sanitizing the
test output to replace all instances of `runtime.call\d+' with
`runtime.callXX', so that the test output will not vary between
architectures.
If nobody objects, I intend to NMU the package tomorrow and forward the
fix upstream.
Regards,
Apollon
diff -Nru golang-github-jacobsa-ogletest-0.0~git20150610/debian/changelog golang-github-jacobsa-ogletest-0.0~git20150610/debian/changelog
--- golang-github-jacobsa-ogletest-0.0~git20150610/debian/changelog 2017-01-11 19:42:43.000000000 +0200
+++ golang-github-jacobsa-ogletest-0.0~git20150610/debian/changelog 2017-05-02 14:14:37.000000000 +0300
@@ -1,3 +1,11 @@
+golang-github-jacobsa-ogletest (0.0~git20150610-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Handle architecture-dependent output in panicking test. Fixes FTBFS on
+ i386 (Closes: #860646).
+
+ -- Apollon Oikonomopoulos <apoi...@debian.org> Tue, 02 May 2017 14:14:37 +0300
+
golang-github-jacobsa-ogletest (0.0~git20150610-6) unstable; urgency=medium
* Team upload.
diff -Nru golang-github-jacobsa-ogletest-0.0~git20150610/debian/files golang-github-jacobsa-ogletest-0.0~git20150610/debian/files
--- golang-github-jacobsa-ogletest-0.0~git20150610/debian/files 2017-01-11 19:40:53.000000000 +0200
+++ golang-github-jacobsa-ogletest-0.0~git20150610/debian/files 1970-01-01 02:00:00.000000000 +0200
@@ -1 +0,0 @@
-golang-github-jacobsa-ogletest_0.0~git20150610-6_source.buildinfo devel extra
diff -Nru golang-github-jacobsa-ogletest-0.0~git20150610/debian/patches/mangle-runtime.callXX.patch golang-github-jacobsa-ogletest-0.0~git20150610/debian/patches/mangle-runtime.callXX.patch
--- golang-github-jacobsa-ogletest-0.0~git20150610/debian/patches/mangle-runtime.callXX.patch 1970-01-01 02:00:00.000000000 +0200
+++ golang-github-jacobsa-ogletest-0.0~git20150610/debian/patches/mangle-runtime.callXX.patch 2017-05-02 14:14:37.000000000 +0300
@@ -0,0 +1,49 @@
+Author: Apollon Oikonomopoulos <apoi...@debian.org>
+Description: Mangle arch-dependent runtime.callXX tokens in test output
+ Strip architecture-dependent strings from the test output, as these break the
+ panicking test (at least) on i386.
+Bug-Debian: 860646
+Forwarded: no
+Last-Update: 2017-05-02
+--- a/integration_test.go
++++ b/integration_test.go
+@@ -142,6 +142,10 @@
+ timingRe4 := regexp.MustCompile(`SlowTest \([0-9.]+ms\)`)
+ o = timingRe4.ReplaceAll(o, []byte("SlowTest (1234ms)"))
+
++ // Replace arch-dependent runtime.call32 etc. with runtime.callXX
++ callRe := regexp.MustCompile(`runtime.call\d+`)
++ o = callRe.ReplaceAll(o, []byte("runtime.callXX"))
++
+ return o
+ }
+
+--- a/test_cases/golden.panicking_test
++++ b/test_cases/golden.panicking_test
+@@ -6,7 +6,7 @@
+
+ github.com/jacobsa/ogletest/somepkg_test.(*PanickingTest).ExplicitPanic
+ some_file.txt:0
+-runtime.call32
++runtime.callXX
+ some_file.txt:0
+ reflect.Value.call
+ some_file.txt:0
+@@ -24,7 +24,7 @@
+ some_file.txt:0
+ github.com/jacobsa/ogletest/somepkg_test.(*PanickingTest).ExplicitPanicInHelperFunction
+ some_file.txt:0
+-runtime.call32
++runtime.callXX
+ some_file.txt:0
+ reflect.Value.call
+ some_file.txt:0
+@@ -40,7 +40,7 @@
+
+ github.com/jacobsa/ogletest/somepkg_test.(*PanickingTest).NilPointerDerefence
+ some_file.txt:0
+-runtime.call32
++runtime.callXX
+ some_file.txt:0
+ reflect.Value.call
+ some_file.txt:0
diff -Nru golang-github-jacobsa-ogletest-0.0~git20150610/debian/patches/series golang-github-jacobsa-ogletest-0.0~git20150610/debian/patches/series
--- golang-github-jacobsa-ogletest-0.0~git20150610/debian/patches/series 2017-01-11 19:29:43.000000000 +0200
+++ golang-github-jacobsa-ogletest-0.0~git20150610/debian/patches/series 2017-05-02 14:14:37.000000000 +0300
@@ -1,2 +1,3 @@
803320.patch
dump-golden-files.patch
+mangle-runtime.callXX.patch
