From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 10 Jan 2017 17:00:42 +0000 (+0000)
Subject: test suite: Arrange not to overwrite .save-env on t-chain-test
X-Git-Tag: archive/debian/3.1~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=abbe9041dc53bc874ec845f1c7353d43a864b560;hp=470a6734ed3fb8ed87d76e7dc716963cfe232e6b;p=dgit.git

test suite: Arrange not to overwrite .save-env on t-chain-test

We want .save-env to be the env on entry to the original test, not
on execution of t-chain-test with a modified environment.

Without this the effects of t-defdistro might leak into the execution
of tests/setup/examplegit.  This is no good because
tests/setup/examplegit relies in the -dtest-dummy which is our usual
dgit runes.  (Or to put it another way, examplegit uses many suites
which are not (yet) set up properly by t-defdistro.)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/lib b/tests/lib
index 4ddd6d8a..7023dbfa 100644
--- a/tests/lib
+++ b/tests/lib
@@ -53,6 +53,7 @@ tmp=`pwd`
 
 t-set-using-tmp
 
+test -f $tmp/.save-env || \
 env -0 >$tmp/.save-env
 
 ln -f $troot/ssh ssh