chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test suite: Propagate tmpbase into nested (setup) runs
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index b4642ae89556a05fb38699635ac898d39af224bd..3fe3ab06af8e240a98b59b1cea874e4f49dfe18a 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-21,6
+21,8
@@
END
trap 'test $? = 0 || t-report-failure' EXIT
trap 'test $? = 0 || t-report-failure' EXIT
+t-filter-out-git-hyphen-dir
+
t-set-intree
: ${DGIT_TEST_DEBUG=-D}
t-set-intree
: ${DGIT_TEST_DEBUG=-D}
@@
-40,6
+42,8
@@
if [ x"$tmp" = x ]; then
tmp=tests/tmp/$testname
rm -rf $tmp
mkdir $tmp
tmp=tests/tmp/$testname
rm -rf $tmp
mkdir $tmp
+elif [ "x$DGIT_TEST_TMPBASE" != x ]; then
+ tmpbase="$DGIT_TEST_TMPBASE"
fi
cd $tmp
fi
cd $tmp
@@
-379,7
+383,8
@@
t-setup-done () {
local savedirs=$2
local importeval=$3
local savedirs=$2
local importeval=$3
- exec 4>$tmp/IMPORT.new
+ local import=IMPORT.${0##*/}
+ exec 4>$tmp/$import.new
local vn
for vn in $savevars; do
local vn
for vn in $savevars; do
@@
-388,11
+393,11
@@
t-setup-done () {
' $vn "$(eval "printf '%s\n' \"\$$vn\"")"
done
' $vn "$(eval "printf '%s\n' \"\$$vn\"")"
done
- (set -e; cd $tmp; tar cf
IMPORT
.tar $savedirs)
+ (set -e; cd $tmp; tar cf
$import
.tar $savedirs)
printf >&4 "\n%s\n" "$importeval"
printf >&4 "\n%s\n" "$importeval"
- mv -f $tmp/
IMPORT.new $tmp/IMPORT
+ mv -f $tmp/
$import.new $tmp/$import
}
t-setup-import () {
}
t-setup-import () {
@@
-410,7
+415,7
@@
t-setup-import () {
lock="$setupsrc.lock"
fi
lock="$setupsrc.lock"
fi
- local simport="$setupsrc/IMPORT"
+ local simport="$setupsrc/IMPORT
.$setupname
"
if ! [ -e "$simport" ]; then
with-lock-ex -w "$lock" \
if ! [ -e "$simport" ]; then
with-lock-ex -w "$lock" \
@@
-776,7
+781,7
@@
t-git-pseudo-merge () {
git merge $git_pseuomerge_opts "$@"
}
git merge $git_pseuomerge_opts "$@"
}
-t-gbp-example-prep () {
+t-gbp-example-prep
-no-ff
() {
t-tstunt-parsechangelog
t-archive example 1.0-1
t-git-none
t-tstunt-parsechangelog
t-archive example 1.0-1
t-git-none
@@
-786,7
+791,7
@@
t-gbp-example-prep () {
t-dgit fetch
t-dgit fetch
- git
-
checkout -b patch-queue/quilt-tip-2 patch-queue/quilt-tip
+ git
checkout -b patch-queue/quilt-tip-2 patch-queue/quilt-tip
gbp pq rebase
echo '/* some comment */' >>src.c
gbp pq rebase
echo '/* some comment */' >>src.c
@@
-796,6
+801,10
@@
t-gbp-example-prep () {
t-gbp-unapplied-pq2qc
t-commit 'some updates' 1.0-2
t-gbp-unapplied-pq2qc
t-commit 'some updates' 1.0-2
+}
+
+t-gbp-example-prep () {
+ t-gbp-example-prep-no-ff
t-git-pseudo-merge \
-m 'Pseudo-merge to make descendant of archive' \
t-git-pseudo-merge \
-m 'Pseudo-merge to make descendant of archive' \
@@
-918,6
+927,7
@@
t-chain-test () {
local d=${0%/*}
cd $root
export DGIT_TEST_TESTNAME="$testname"
local d=${0%/*}
cd $root
export DGIT_TEST_TESTNAME="$testname"
+ export DGIT_TEST_TMPBASE="$tmpbase"
export ADTTMP=$tmp
exec "$d/$ct"
}
export ADTTMP=$tmp
exec "$d/$ct"
}