diff options
| author | Lars Wirzenius <liw@mavolio.codethink.co.uk> | 2011-10-18 15:02:24 +0100 |
|---|---|---|
| committer | Lars Wirzenius <liw@mavolio.codethink.co.uk> | 2011-10-18 15:02:24 +0100 |
| commit | a7c03e83608da61ff864d895094b7d5d4861e163 (patch) | |
| tree | 901a96a3017bb347aa52401c8daf1e285804560d /tests | |
| parent | ec52626583ed772c359321203f88315840079e67 (diff) | |
| download | morph-a7c03e83608da61ff864d895094b7d5d4861e163.tar.gz | |
Normalize the output from tar for tests.
For whatever reasons, when running the tests on Debian squeeze
and Debian wheezy, the output differs as to whether the pathnames
start with "./" or not.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/hello-chunk.script | 2 | ||||
| -rwxr-xr-x | tests/hello-stratum.script | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/hello-chunk.script b/tests/hello-chunk.script index aa20bbbe..cdfd7437 100755 --- a/tests/hello-chunk.script +++ b/tests/hello-chunk.script @@ -23,4 +23,4 @@ tar -C "$DATADIR" -xf tests/hello-chunk.tar.gz ./morph --no-default-configs build "$DATADIR/hello/hello.morph" \ --chunk-repo="file://$DATADIR/hello" --chunk-ref=master \ --cachedir="$DATADIR" -tar -tf "$DATADIR/"*.chunk | LC_ALL=C sort +tar -tf "$DATADIR/"*.chunk | LC_ALL=C sort | sed '/^\.\/./s:^\./::' diff --git a/tests/hello-stratum.script b/tests/hello-stratum.script index 663fd10b..0e53cd51 100755 --- a/tests/hello-stratum.script +++ b/tests/hello-stratum.script @@ -24,4 +24,4 @@ tar -C "$DATADIR" -xf tests/hello-chunk.tar.gz ./morph --no-default-configs build "tests/hello-stratum.morph" \ --git-base-url "file://$DATADIR/" \ --cachedir="$DATADIR" -tar -tf "$DATADIR/"*.stratum | LC_ALL=C sort +tar -tf "$DATADIR/"*.stratum | LC_ALL=C sort | sed '/^\.\/./s:^\./::' |