small solaris portability fixes from John Levon <[e-mail]>

tests/run-tests

@@ -19,6 +19,9 b' HGEDITOR=true; export HGEDITOR'
 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 b' if [ -z "$TESTS" ] ; then'
 fi
 
 for f in $TESTS ; do
-    echo -n "."
+    $ECHO_N "."
     run_one $f || failed=`expr $failed + 1`
     tests=`expr $tests + 1`
 done

tests/test-archive

@@ -30,8 +30,8 b" f = urllib2.urlopen('http://127.0.0.1:20"
                     % (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/"
 

tests/test-conflict

@@ -12,5 +12,5 b' hg commit -m branch2 -d "0 0"'
 HGMERGE=merge; export HGMERGE
 hg up -m 1
 hg id
-grep -Ev ">>>|<<<" a
+egrep -v ">>>|<<<" a
 hg status