[debian-edu-commits] debian-edu/ 01/01: Ignore survey ID in tests.

Dominik George natureshadow-guest at moszumanska.debian.org
Tue Jan 16 10:28:16 UTC 2018


This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository sdaps.

commit 236da4401b858a48bd6f81e37a98c3b6b8576e2b
Author: Dominik George <nik at naturalnet.de>
Date:   Tue Jan 16 11:13:06 2018 +0100

    Ignore survey ID in tests.
---
 debian/patches/fix_tests.patch | 19 +++++++++++++++++++
 debian/patches/series          |  1 +
 2 files changed, 20 insertions(+)

diff --git a/debian/patches/fix_tests.patch b/debian/patches/fix_tests.patch
new file mode 100644
index 0000000..84ee1f6
--- /dev/null
+++ b/debian/patches/fix_tests.patch
@@ -0,0 +1,19 @@
+From: Dominik George <nik at naturalnet.de>
+Subject: Ignore survey ID when comparing test reference data
+ The generation of the survey ID is very fragile due to minor differences
+ in TeX output and the way it is calculated. This will be improved
+ by upstream, so we ignore the test for now.
+--- a/test/run-test.sh
++++ b/test/run-test.sh
+@@ -190,9 +190,9 @@ for i in projects/*; do
+     if [ ! -f "$j" ]; then
+       continue;
+     fi;
+-    # This ignores the title; for whatever reason the \LaTeX
++    # This ignores the title and survey_id; for whatever reason the \LaTeX
+     # is written out differently with newer latex versions.
+-    diff -I '^title' "$j" "$i/info" && success=1 || error=1
++    diff -I '^(title|survey_id)' "$j" "$i/info" && success=1 || error=1
+   done
+ 
+   if [ $success -eq 0 -a $error -ne 0 ]; then
diff --git a/debian/patches/series b/debian/patches/series
index b5ec18f..407c517 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 remove_latex_copy.patch
 merge_texinputs.patch
+fix_tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/sdaps.git



More information about the debian-edu-commits mailing list