aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc G. Fournier <scrappy@hub.org>1997-04-27 18:55:37 +0000
committerMarc G. Fournier <scrappy@hub.org>1997-04-27 18:55:37 +0000
commit65973e3f3530f8b87d0efe0c4c30d51d067f5fea (patch)
treec5d6e05e467a6d1131b09362b2a06ece138bca5f
parenta426ff583d6fdc46be5c66d70ac5f159b0b46672 (diff)
downloadpostgresql-65973e3f3530f8b87d0efe0c4c30d51d067f5fea.tar.gz
postgresql-65973e3f3530f8b87d0efe0c4c30d51d067f5fea.zip
From: Keith Parks <emkxp01@mtcc.demon.co.uk>
Subject: [PATCHES] to make regress.sh shell friendly to echo. Hi, I needed to make the following change to regress.sh to make it more shell friendly. The Solaris /bin/sh, and others, use \c to supress the newline.
-rwxr-xr-xsrc/test/regress/regress.sh13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/test/regress/regress.sh b/src/test/regress/regress.sh
index f18a1ba387d..8bc7ac4f1aa 100755
--- a/src/test/regress/regress.sh
+++ b/src/test/regress/regress.sh
@@ -1,6 +1,15 @@
#!/bin/sh
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.8 1997/04/27 02:56:18 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.9 1997/04/27 18:55:37 scrappy Exp $
#
+if echo '\c' | grep -s c >/dev/null 2>&1
+then
+ ECHO_N="echo -n"
+ ECHO_C=""
+else
+ ECHO_N="echo"
+ ECHO_C='\c'
+fi
+
if [ -d ./obj ]; then
cd ./obj
fi
@@ -33,7 +42,7 @@ fi
echo "=============== running regression queries... ================="
for i in `cat sql/tests`
do
- echo -n "${i} .. "
+ $ECHO_N "${i} .. " $ECHO_C
$FRONTEND regression < sql/${i}.sql > results/${i}.out 2>&1
if [ `diff expected/${i}.out results/${i}.out | wc -l` -ne 0 ]
then