summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2014-11-16 20:32:22 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2014-11-16 20:39:16 +0000
commit8c84500206dbe1b1cf4aea1f4b497ab279685066 (patch)
tree71f1093aa9018ac2442dda20204f5370c7cf26e9
parent36e765bdfb9e3b186be796d784f00a900050c295 (diff)
tests/tests/quilt: Reorganise loop into a function (nfc)
-rwxr-xr-xtests/tests/quilt9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/tests/quilt b/tests/tests/quilt
index 9a4b105..c9a50e9 100755
--- a/tests/tests/quilt
+++ b/tests/tests/quilt
@@ -19,9 +19,7 @@ git fetch $tmp/incoming/$p dgit/sid:incoming
dummy=0
-for cherry in incoming~1 incoming~0; do
- git cherry-pick -x $cherry
-
+iteration () {
dummy=$(( $dummy + 1))
v=3.2.6-2~dummy${dummy}
@@ -29,7 +27,10 @@ for cherry in incoming~1 incoming~0; do
t-dgit --dpkg-buildpackage:-d build
t-dgit push
t-pushed-good dgit/sid
-done
+}
+
+git cherry-pick -x incoming~1; iteration
+git cherry-pick -x incoming~0; iteration
t-822-field ../${p}_${v}_*.changes Changes |
grep -Fx 'ruby-rails-3.2 (3.2.6-2~dummy1) unstable; urgency=low'