From fdcf5ff79ccee213eadeb15942a186c82737fd6b Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 14 Nov 1996 16:09:28 +0000
Subject: [PATCH] Remove comments psql was putting in output, typo's. psql now
 returns error from queries and errors files, so ignore return code.

---
 src/test/regress/expected.input | 14 +++++++-------
 src/test/regress/queries.source |  6 +++---
 src/test/regress/regress.sh     | 12 +++---------
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/test/regress/expected.input b/src/test/regress/expected.input
index 0d4ad38f4e..6e4f4b55f3 100644
--- a/src/test/regress/expected.input
+++ b/src/test/regress/expected.input
@@ -416,15 +416,15 @@ QUERY: CREATE OPERATOR <% (
    commutator = >=%
 );
 QUERY: CREATE OPERATOR @#@ (
-   rightarg = int4,		-- left unary
+   rightarg = int4,
    procedure = int4fac
 );
 QUERY: CREATE OPERATOR #@# (
-   leftarg = int4,		-- right unary
+   leftarg = int4,
    procedure = int4fac
 );
 QUERY: CREATE OPERATOR #%# (
-   leftarg = int4,		-- right unary
+   leftarg = int4,
    procedure = int4fac
 );
 QUERY: CREATE VIEW street AS
@@ -799,7 +799,7 @@ six|f1
 (6 rows)
 
 QUERY: SELECT '' AS five, ABSTIME_TBL.*
-  WHERE  (ABSTIME_TBL.f1 + '@ 3 year'::reltime)     -- +3 years
+  WHERE  (ABSTIME_TBL.f1 + '@ 3 year'::reltime)
 	< 'Jan 14 14:00:00 1977'::abstime;
 five|f1                          
 ----+----------------------------
@@ -811,7 +811,7 @@ five|f1
 (5 rows)
 
 QUERY: SELECT '' AS five, ABSTIME_TBL.*
-   WHERE  (ABSTIME_TBL.f1 + '@ 3 year ago'::reltime) -- -3 years
+   WHERE  (ABSTIME_TBL.f1 + '@ 3 year ago'::reltime)
 	< 'Jan 14 14:00:00 1971'::abstime;
 five|f1                          
 ----+----------------------------
@@ -823,7 +823,7 @@ five|f1
 (5 rows)
 
 QUERY: SELECT '' AS five, ABSTIME_TBL.*
-   WHERE  (ABSTIME_TBL.f1 - '@ 3 year'::reltime)     -- -(+3) years
+   WHERE  (ABSTIME_TBL.f1 - '@ 3 year'::reltime)
 	< 'Jan 14 14:00:00 1971'::abstime;
 five|f1                          
 ----+----------------------------
@@ -835,7 +835,7 @@ five|f1
 (5 rows)
 
 QUERY: SELECT '' AS five, ABSTIME_TBL.*
-   WHERE  (ABSTIME_TBL.f1 - '@ 3 year ago'::reltime) -- -(-3) years
+   WHERE  (ABSTIME_TBL.f1 - '@ 3 year ago'::reltime)
 	< 'Jan 14 14:00:00 1977'::abstime;
 five|f1                          
 ----+----------------------------
diff --git a/src/test/regress/queries.source b/src/test/regress/queries.source
index 68385b8e1f..1e98570479 100644
--- a/src/test/regress/queries.source
+++ b/src/test/regress/queries.source
@@ -1,7 +1,7 @@
 --
 -- queries.source
 --
--- $Header: /cvsroot/pgsql/src/test/regress/Attic/queries.source,v 1.3 1996/10/30 02:02:39 momjian Exp $
+-- $Header: /cvsroot/pgsql/src/test/regress/Attic/queries.source,v 1.4 1996/11/14 16:09:26 momjian Exp $
 --
 -- The comments that contain sequences of UNIX commands generate the 
 -- desired output for the POSTQUEL statement(s).
@@ -837,9 +837,9 @@ SELECT '' AS bad, f.f1 * '1e200' from FLOAT8_TBL f;
 
 SELECT '' AS bad, f.f1 ^ '1e200' from FLOAT8_TBL f;
 
-SELECT '' AS bad, ; (f.f1) from FLOAT8_TBL f where f.f1 = '0.0' ;
+SELECT '' AS bad, : (f.f1) from FLOAT8_TBL f where f.f1 = '0.0' ;
 
-SELECT '' AS bad, ; (f.f1) from FLOAT8_TBL f where f.f1 < '0.0' ;
+SELECT '' AS bad, : (f.f1) from FLOAT8_TBL f where f.f1 < '0.0' ;
 
 SELECT '' AS bad, : (f.f1) from FLOAT8_TBL f;
 
diff --git a/src/test/regress/regress.sh b/src/test/regress/regress.sh
index ccc52ff1c7..cdb154b4a3 100755
--- a/src/test/regress/regress.sh
+++ b/src/test/regress/regress.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.2 1996/10/30 02:02:41 momjian Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.3 1996/11/14 16:09:28 momjian Exp $
 #
 if [ -d ./obj ]; then
 	cd ./obj
@@ -28,17 +28,11 @@ fi
 
 echo =============== running regression queries ... =================
 $FRONTEND regression < queries.sql
-if [ $? -ne 0 ]; then
-     echo the queries script causes an error
-     exit 1
-fi
+# this will generate error result code
 
 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