Mercurial > hg > gitweb

changeset 1925:c71420b186b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small solaris portability fixes from John Levon <levon@movementarian.org>
author Peter van Dijk <peter@dataloss.nl>
date Wed, 22 Feb 2006 15:42:48 +0100
parents 46fb38ef9a91
children ba198d17eea9
files tests/run-tests tests/test-archive tests/test-conflict
diffstat 3 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tests/run-tests	Tue Feb 21 22:32:17 2006 +0100
+++ b/tests/run-tests	Wed Feb 22 15:42:48 2006 +0100
@@ -19,6 +19,9 @@
 HGMERGE=true; export HGMERGE
 HGUSER="test"; export HGUSER
 
+ECHO_N="echo -n"
+[ -x /usr/ucb/echo ] && ECHO_N="/usr/ucb/echo -n"
+
 umask 022
 
 tests=0
@@ -126,7 +129,7 @@
 fi
 
 for f in $TESTS ; do
-    echo -n "."
+    $ECHO_N "."
     run_one $f || failed=`expr $failed + 1`
     tests=`expr $tests + 1`
 done
--- a/tests/test-archive	Tue Feb 21 22:32:17 2006 +0100
+++ b/tests/test-archive	Wed Feb 22 15:42:48 2006 +0100
@@ -30,8 +30,8 @@
                     % (node, archive))
 sys.stdout.write(f.read())
 EOF
-http_proxy= python getarchive.py "$TIP" gz | tar tzf - | sed "s/$QTIP/TIP/"
-http_proxy= python getarchive.py "$TIP" bz2 | tar tjf - | sed "s/$QTIP/TIP/"
+http_proxy= python getarchive.py "$TIP" gz | gunzip -dc - | tar tf - | sed "s/$QTIP/TIP/"
+http_proxy= python getarchive.py "$TIP" bz2 | bunzip2 -dc - | tar tf - | sed "s/$QTIP/TIP/"
 http_proxy= python getarchive.py "$TIP" zip > archive.zip
 unzip -t archive.zip | sed "s/$QTIP/TIP/"
 
--- a/tests/test-conflict	Tue Feb 21 22:32:17 2006 +0100
+++ b/tests/test-conflict	Wed Feb 22 15:42:48 2006 +0100
@@ -12,5 +12,5 @@
 HGMERGE=merge; export HGMERGE
 hg up -m 1
 hg id
-grep -Ev ">>>|<<<" a
+egrep -v ">>>|<<<" a
 hg status