On Sat, 30 Aug 2014 14:17:12 +0200 Gilles Filippini <p...@debian.org> wrote: > Source: meep > Version: 1.2.1-2 > Severity: serious > Tags: patch > Justification: randomly FTBFS > > Hi, > > On slow archs meep has to be given back several times because of sbuild > inactivity walltime being triggered in dh_auto_test. > > Please find a patch proposal to address this issue by allowing the > tests logs to be displayed during the build.
Here is a new version of the patch fixing a few issues. Thanks, _g.
diff -Nru meep-1.2.1/debian/changelog meep-1.2.1/debian/changelog --- meep-1.2.1/debian/changelog 2014-08-03 10:12:17.000000000 +0000 +++ meep-1.2.1/debian/changelog 2014-08-30 11:29:34.000000000 +0000 @@ -1,3 +1,11 @@ +meep (1.2.1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Workaround random FTBFS due to sbuild inactivity walltime on slow + archs: new patch show-test-logs.patch plus override_dh_auto_test. + + -- Gilles Filippini <p...@barriere.debian.org> Sat, 30 Aug 2014 07:57:29 +0000 + meep (1.2.1-2) unstable; urgency=medium * Support hdf5 1.8.13 new packaging layout. (Closes: #756679) diff -Nru meep-1.2.1/debian/patches/series meep-1.2.1/debian/patches/series --- meep-1.2.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ meep-1.2.1/debian/patches/series 2014-08-30 10:50:27.000000000 +0000 @@ -0,0 +1 @@ +show-test-logs.patch diff -Nru meep-1.2.1/debian/patches/show-test-logs.patch meep-1.2.1/debian/patches/show-test-logs.patch --- meep-1.2.1/debian/patches/show-test-logs.patch 1970-01-01 00:00:00.000000000 +0000 +++ meep-1.2.1/debian/patches/show-test-logs.patch 2014-08-30 14:46:07.000000000 +0000 @@ -0,0 +1,27 @@ +Description: run testcases through a wrapper piping logs + This is used in debian/rules:override_dh_auto_test to have test logs + displayed during the tests execution, to workaround random FTBFS + triggered by sbuild inactivity walltime on slow archs. +Index: meep-1.2.1/tests/Makefile.am +=================================================================== +--- meep-1.2.1.orig/tests/Makefile.am ++++ meep-1.2.1/tests/Makefile.am +@@ -73,7 +73,7 @@ pml_LDADD = $(LIBMEEP) + + TESTS = aniso_disp bench bragg_transmission convergence_cyl_waveguide cylindrical flux harmonics integrate known_results one_dimensional physical stress_tensor symmetry three_d two_dimensional 2D_convergence h5test pml + +-LOG_COMPILER = $(RUNCODE) ++LOG_COMPILER = ./wrapper "$(RUNCODE)" + + # Note: this requires GNU make + +Index: meep-1.2.1/tests/wrapper +=================================================================== +--- /dev/null ++++ meep-1.2.1/tests/wrapper +@@ -0,0 +1,5 @@ ++#!/bin/sh ++runcode="$1" ++shift ++ ++$runcode "$@" | tee >&3 diff -Nru meep-1.2.1/debian/rules meep-1.2.1/debian/rules --- meep-1.2.1/debian/rules 2014-08-03 10:13:17.000000000 +0000 +++ meep-1.2.1/debian/rules 2014-08-30 15:12:07.000000000 +0000 @@ -33,4 +33,13 @@ override_dh_clean: # we do not need this anymore rm -f tests/latest_output + rm -f tests/pipelog dh_clean + +# Workaround random FTBFS caused by sbuild inactivity walltime +# Use patch show-test-logs.patch +override_dh_auto_test: + chmod a+x tests/wrapper + mkfifo tests/pipelog + cat tests/pipelog & + exec 3>tests/pipelog && dh_auto_test
signature.asc
Description: OpenPGP digital signature