From: t-ishii@sra.co.jp

[postgresql] / src / test / regress / regress.sh

diff --git a/src/test/regress/regress.sh b/src/test/regress/regress.sh
index fb17ab7a721748bce8cf67d50739969bb9e24804..488dab8c36fdab3f5e0ac49074433a5712dec453 100755 (executable)
--- a/src/test/regress/regress.sh
+++ b/src/test/regress/regress.sh
@@ -1,42 +1,79 @@
 #!/bin/sh
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.1.1.1 1996/07/09 06:22:24 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.20 1998/07/26 04:31:41 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
 
+PGTZ="PST8PDT"; export PGTZ
+PGDATESTYLE="Postgres,US"; export PGDATESTYLE
+
 #FRONTEND=monitor
 FRONTEND="psql -n -e -q"
 
-echo =============== destroying old regression database... =================
+SYSTEM=`uname -s`
+
+echo "=============== Notes...                              ================="
+echo "postmaster must already be running for the regression tests to succeed."
+echo "The time zone is now set to PST8PDT explicitly by this regression test"
+echo " client frontend. Please report any apparent problems to"
+echo "   ports@postgresql.org"
+echo "See regress/README for more information."
+echo ""
+
+echo "=============== destroying old regression database... ================="
 destroydb regression
 
-echo =============== creating new regression database... =================
+echo "=============== creating new regression database...   ================="
 createdb regression
 if [ $? -ne 0 ]; then
      echo createdb failed
      exit 1
 fi
 
-$FRONTEND regression < create.sql
-if [ $? -ne 0 ]; then
-     echo the creation script has an error
-     exit 1
-fi
-
-echo =============== running regression queries ... =================
-$FRONTEND regression < queries.sql
-if [ $? -ne 0 ]; then
-     echo the queries script causes an error
-     exit 1
+echo "=============== running regression queries...         ================="
+echo "" > regression.diffs
+if [ -n "$MULTIBYTE" ];then
+       mbtests=`echo $MULTIBYTE|tr "[A-Z]" "[a-z]"`
+else
+       mbtests=""
 fi
+for i in `cat sql/tests` $mbtests
+do
+       $ECHO_N "${i} .. " $ECHO_C
+       $FRONTEND regression < sql/${i}.sql > results/${i}.out 2>&1
+       if [ -f expected/${i}-${SYSTEM}.out ]
+       then
+               EXPECTED="expected/${i}-${SYSTEM}.out"
+       else
+               EXPECTED="expected/${i}.out"
+       fi
+  
+       if [ `diff ${EXPECTED} results/${i}.out | wc -l` -ne 0 ]
+       then
+               ( diff -wC3 ${EXPECTED} results/${i}.out; \
+               echo "";  \
+               echo "----------------------"; \
+               echo "" ) >> regression.diffs
+               echo failed
+       else
+               echo ok
+       fi
+done
+exit
 
-echo =============== running error queries ... =================
+echo "=============== running error queries ...             ================="
 $FRONTEND regression < errors.sql
-if [ $? -ne 0 ]; then
-     echo the errors script has an unanticipated problem
-     exit 1
-fi
+# this will generate error result code
 
 #set this to 1 to avoid clearing the database
 debug=0
@@ -45,7 +82,7 @@ if test "$debug" -eq 1
 then
 echo Skipping clearing and deletion of the regression database
 else
-echo =============== clearing regression database... =================
+echo "=============== clearing regression database...       ================="
 $FRONTEND regression < destroy.sql
 if [ $? -ne 0 ]; then
      echo the destroy script has an error
@@ -53,7 +90,7 @@ if [ $? -ne 0 ]; then
 fi
 
 exit 0
-echo =============== destroying regression database... =================
+echo "=============== destroying regression database...     ================="
 destroydb regression
 if [ $? -ne 0 ]; then
      echo destroydb failed