diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-11-17 16:36:43 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-11-24 17:45:27 +0000 |
commit | c4ed4e776fe57b77e1f4c2194a8377b09690ec04 (patch) | |
tree | 363af7ea612ec342a722e159fce7d049d043c0f6 | |
parent | c2d43f9859a861f8522c32bb42e9f74fd229b6bf (diff) |
autopkgtests: fixes
-rw-r--r-- | debian/tests/control | 2 | ||||
-rw-r--r-- | tests/lib | 2 | ||||
-rwxr-xr-x | tests/tests/push-newpackage | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/debian/tests/control b/debian/tests/control index ed68bf5..651e118 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ -Tests: clone-nogit +Tests: clone-nogit fetch-nogit push-newpackage Tests-Directory: tests/tests Depends: @ @@ -103,7 +103,7 @@ t-clean-on-branch () { t-git-get-ref () { local ref=$1 - git-show-ref -d $1 | perl -ne ' + git show-ref -d $1 | perl -ne ' $x = $1 if m#^(\w+) \Q'$1'\E(?:\^\{\})?$#; END { print "$x\n" if length $x; } ' diff --git a/tests/tests/push-newpackage b/tests/tests/push-newpackage index 2d01657..92c9361 100755 --- a/tests/tests/push-newpackage +++ b/tests/tests/push-newpackage @@ -7,8 +7,8 @@ t-git-none t-worktree 3-1 v=3-1 cd $p -git-branch -m dgit/sid master -git-remote rm dgit +git branch -m dgit/sid master +git remote rm dgit LANG=C t-dgit push 2>&1 \ | tee /dev/stderr \ |