From 4b9792d860053677effd3443d523f1ece3eeca09 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sun, 12 Jun 2016 09:50:51 -0400
Subject: [PATCH] If build-time tests fail, try 4 more times

To get an idea of whether the failure is reproducible.
---
 debian/changelog |  2 ++
 debian/test.sh   | 22 +++++++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 083c30b7..4fb025cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ ostree (2016.5-4) UNRELEASED; urgency=medium
   * Build-depend on procps, used to check for leaked processes
   * debian/test.sh: factor out our dh_auto_test wrapper, and clean
     up any stray processes even if the test fails
+  * If build-time tests fail, try 4 more times to get an idea of
+    whether the failure is reproducible
 
  -- Simon McVittie <smcv@debian.org>  Sat, 11 Jun 2016 19:52:40 +0100
 
diff --git a/debian/test.sh b/debian/test.sh
index 69e4f8df..e2ac075c 100755
--- a/debian/test.sh
+++ b/debian/test.sh
@@ -4,8 +4,19 @@ set -e
 
 export VERBOSE=1
 
-exit_status=0
-dh_auto_test || exit_status=1
+try_tests=5
+
+failed=0
+make check || failed=1
+
+if [ "$failed" -gt 0 ]; then
+    echo "Test failed! Checking how reproducible it is..."
+    for i in $(seq 1 "$(( $try_tests - 1 ))"); do
+        if ! make check; then
+            failed=$(( $failed + 1 ))
+        fi
+    done
+fi
 
 pkill --full "gpg-agent --homedir /var/tmp/tap-test\\.[^/]+/.*" || :
 
@@ -15,6 +26,11 @@ if pgrep lt-ostree || pgrep --full "gpg-agent --homedir /var/tmp/tap-test."; the
     pgrep lt-ostree | xargs --no-run-if-empty ps ww
 fi
 
-exit $exit_status
+if [ "$failed" -gt 0 ]; then
+    echo "Failed $failed out of $try_tests test runs"
+    exit 1
+fi
+
+exit 0
 
 # vim:set et sw=4 sts=4: