From c4a7c6eef11cdebf3a949038c2a4b48dacf429b8 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Wed, 18 May 2022 12:08:35 +1200 Subject: [PATCH] New patch cherry picked from upstream: fix-cavern-tst.patch --- debian/changelog | 1 + debian/patches/fix-cavern-tst.patch | 22 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 24 insertions(+) create mode 100644 debian/patches/fix-cavern-tst.patch diff --git a/debian/changelog b/debian/changelog index ca3e92e8..70dec5dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ survex (1.4.2-2) unstable; urgency=medium * New upstream release. * New patch cherry picked from upstream: fix-clino-red-line.patch + * New patch cherry picked from upstream: fix-cavern-tst.patch * debian/control: Mark conformance with policy 4.6.1. -- Olly Betts Wed, 18 May 2022 11:20:53 +1200 diff --git a/debian/patches/fix-cavern-tst.patch b/debian/patches/fix-cavern-tst.patch new file mode 100644 index 00000000..52c78f11 --- /dev/null +++ b/debian/patches/fix-cavern-tst.patch @@ -0,0 +1,22 @@ +commit b1200a60be7bdea20ffebbd8bb15386041727fa6 +Author: Olly Betts +Date: Wed May 18 12:06:36 2022 +1200 + + Fix cavern.tst to work with SOURCE_DATE_EPOCH set + +diff --git a/tests/cavern.tst b/tests/cavern.tst +index cec23be2..d2b189af 100755 +--- a/tests/cavern.tst ++++ b/tests/cavern.tst +@@ -88,6 +88,11 @@ export SURVEXLANG + LSAN_OPTIONS=leak_check_at_exit=0 + export LSAN_OPTIONS + ++# Allow datestamps in 3d files (we normalise the expected output for GPX ++# etc) to allow for the datestamp not being fixed, but under SOURCE_DATE_EPOCH ++# the datestamp is omitted entirely which would break those testcases. ++unset SOURCE_DATE_EPOCH ++ + vg_error=123 + vg_log=$testdir/vg.log + if [ -n "$VALGRIND" ] ; then diff --git a/debian/patches/series b/debian/patches/series index 2574d230..e094bf10 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ fix-clino-red-line.patch +fix-cavern-tst.patch -- 2.11.4.GIT