# HG changeset patch # User Martin Geisler # Date 2010-08-14 00:26:53 # Node ID aa2abde72da1577d9c7cfacd953a6b31ac3fcce5 # Parent afe19a1bf9d3ab502c2b965dd8800ea51c976efb tests: unify test-archive-symlinks diff --git a/tests/test-archive-symlinks.out b/tests/test-archive-symlinks.out deleted file mode 100644 --- a/tests/test-archive-symlinks.out +++ /dev/null @@ -1,6 +0,0 @@ -% files -dangling -> nothing -% tar -dangling -> nothing -% zip -dangling -> nothing diff --git a/tests/test-archive-symlinks b/tests/test-archive-symlinks.t old mode 100755 new mode 100644 rename from tests/test-archive-symlinks rename to tests/test-archive-symlinks.t --- a/tests/test-archive-symlinks +++ b/tests/test-archive-symlinks.t @@ -1,32 +1,38 @@ -#!/bin/sh + $ "$TESTDIR/hghave" symlink || exit 80 + + $ origdir=`pwd` -"$TESTDIR/hghave" symlink || exit 80 - -origdir=`pwd` + $ hg init repo + $ cd repo + $ ln -s nothing dangling -hg init repo -cd repo -ln -s nothing dangling -# avoid tar warnings about old timestamp -hg ci -d '2000-01-01 00:00:00 +0000' -qAm 'add symlink' +avoid tar warnings about old timestamp + + $ hg ci -d '2000-01-01 00:00:00 +0000' -qAm 'add symlink' -hg archive -t files ../archive -hg archive -t tar -p tar ../archive.tar -hg archive -t zip -p zip ../archive.zip + $ hg archive -t files ../archive + $ hg archive -t tar -p tar ../archive.tar + $ hg archive -t zip -p zip ../archive.zip + +files -echo '% files' -cd "$origdir" -cd archive -$TESTDIR/readlink.py dangling + $ cd "$origdir" + $ cd archive + $ $TESTDIR/readlink.py dangling + dangling -> nothing + +tar -echo '% tar' -cd "$origdir" -tar xf archive.tar -cd tar -$TESTDIR/readlink.py dangling + $ cd "$origdir" + $ tar xf archive.tar + $ cd tar + $ $TESTDIR/readlink.py dangling + dangling -> nothing -echo '% zip' -cd "$origdir" -unzip archive.zip > /dev/null -cd zip -$TESTDIR/readlink.py dangling +zip + + $ cd "$origdir" + $ unzip archive.zip > /dev/null + $ cd zip + $ $TESTDIR/readlink.py dangling + dangling -> nothing