diff options
| author | Rob Taylor <rob.taylor@codethink.co.uk> | 2012-01-19 11:49:26 +0000 |
|---|---|---|
| committer | Rob Taylor <rob.taylor@codethink.co.uk> | 2012-01-19 11:49:26 +0000 |
| commit | 6cc10d4bd52ab6c02fbbbf1198acb3d12b83f0c5 (patch) | |
| tree | 4b182bb1e45e36ee1d8eaa2adbb370c74d23c54b /tests | |
| parent | fc4bccb30955370bb0fba909e6b083f999af8abc (diff) | |
| download | morph-6cc10d4bd52ab6c02fbbbf1198acb3d12b83f0c5.tar.gz | |
Fix cmdtests for SourceManager changes
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/missing-ref.script | 11 | ||||
| -rw-r--r-- | tests/missing-ref.stderr | 5 |
2 files changed, 7 insertions, 9 deletions
diff --git a/tests/missing-ref.script b/tests/missing-ref.script index 0c4f29f7..f70715f1 100755 --- a/tests/missing-ref.script +++ b/tests/missing-ref.script @@ -2,7 +2,7 @@ # # Test building with a bad reference. # -# Copyright (C) 2011 Codethink Limited +# Copyright (C) 2011,2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,10 +17,11 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -set -e - +#tempdirs make script diffing cry cache="$DATADIR/build-chunk-cache" ./morph --no-default-configs build chunk-repo non-existent-branch hello.morph \ --git-base-url="file://$DATADIR" \ - --cachedir="$cache" --keep-path --no-distcc - + --cachedir="$cache" --keep-path --no-distcc 2> "$DATADIR/build-chunk-cache.stderr" +err=$? +cat "$DATADIR/build-chunk-cache.stderr" | sed "s%$DATADIR%%" 1>&2 +exit $? diff --git a/tests/missing-ref.stderr b/tests/missing-ref.stderr index 5cf767b3..cd72eec2 100644 --- a/tests/missing-ref.stderr +++ b/tests/missing-ref.stderr @@ -1,4 +1 @@ -ERROR: Command failed: git cat-file blob non-existent-branch:hello.morph -Output from command: -fatal: Not a valid object name non-existent-branch:hello.morph - +ERROR: non-existent-branch is an invalid reference for repo /chunk-repo |