From b2f2e0316e65f359a2dd4e6a9cb9ea09d86ad176 Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Sat, 26 Apr 1997 05:50:25 +0000
Subject: [PATCH] More misc patches from Thomas for regression tests and linux
 templates

---
 src/template/linux-elf                |  8 ++++----
 src/test/regress/expected/reltime.out | 24 ++++++++++++------------
 src/test/regress/regress.sh           | 13 +++++++++++--
 src/test/regress/sql/reltime.sql      |  2 +-
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/template/linux-elf b/src/template/linux-elf
index ca8259ea93..a2b4213fa7 100644
--- a/src/template/linux-elf
+++ b/src/template/linux-elf
@@ -1,10 +1,10 @@
 AROPT:crs
-CFLAGS:
+CFLAGS:-O2
 SHARED_LIB:-fpic
 ALL:
-SRCH_INC:
+SRCH_INC:/usr/include/ncurses /usr/include/readline
 SRCH_LIB:
 USE_LOCALE:no
-DLSUFFIX:.o
+DLSUFFIX:.so
 YFLAGS:-d
-YACC: bison -y
+YACC:bison -y
diff --git a/src/test/regress/expected/reltime.out b/src/test/regress/expected/reltime.out
index 40cd2ab355..592ba9414f 100644
--- a/src/test/regress/expected/reltime.out
+++ b/src/test/regress/expected/reltime.out
@@ -6,19 +6,19 @@ QUERY: INSERT INTO RELTIME_TBL (f1) VALUES ('@ 34 year');
 QUERY: INSERT INTO RELTIME_TBL (f1) VALUES ('@ 3 months');
 QUERY: INSERT INTO RELTIME_TBL (f1) VALUES ('@ 14 seconds ago');
 QUERY: INSERT INTO RELTIME_TBL (f1) VALUES ('badly formatted reltime');
+WARN:Bad reltime external representation 'badly formatted reltime'
 QUERY: INSERT INTO RELTIME_TBL (f1) VALUES ('@ 30 eons ago');
-QUERY: SELECT '' AS eight, RELTIME_TBL.*;
-eight|f1               
------+-----------------
-     |@ 1 minute       
-     |@ 5 hours        
-     |@ 10 days        
-     |@ 34 years       
-     |@ 3 months       
-     |@ 14 seconds ago 
-     |Undefined RelTime
-     |Undefined RelTime
-(8 rows)
+WARN:Bad reltime external representation '@ 30 eons ago'
+QUERY: SELECT '' AS six, RELTIME_TBL.*;
+six|f1              
+---+----------------
+   |@ 1 minute      
+   |@ 5 hours       
+   |@ 10 days       
+   |@ 34 years      
+   |@ 3 months      
+   |@ 14 seconds ago
+(6 rows)
 
 QUERY: SELECT '' AS five, RELTIME_TBL.*
    WHERE RELTIME_TBL.f1 <> '@ 10 days'::reltime;
diff --git a/src/test/regress/regress.sh b/src/test/regress/regress.sh
index e0017e2426..8605bb8763 100755
--- a/src/test/regress/regress.sh
+++ b/src/test/regress/regress.sh
@@ -1,15 +1,24 @@
 #!/bin/sh
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.6 1997/04/06 08:53:34 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.7 1997/04/26 05:49:39 scrappy Exp $
 #
 if [ -d ./obj ]; then
 	cd ./obj
 fi
 
-TZ="PST8PDT"; export TZ
+TZ="PST8PDT7,M04.01.00,M10.05.03"; export TZ
 
 #FRONTEND=monitor
 FRONTEND="psql -n -e -q"
 
+echo =============== Notes... =================
+echo "You must be already running the postmaster"
+echo " for the regression tests to succeed."
+echo "The time zone might need to be set to PST/PDT"
+echo " for the date and time data types to pass the"
+echo " regression tests; to do this type"
+echo "  setenv TZ $TZ"
+echo " before starting the postmaster."
+
 echo =============== destroying old regression database... =================
 destroydb regression
 
diff --git a/src/test/regress/sql/reltime.sql b/src/test/regress/sql/reltime.sql
index 2c300a468e..804ec3f4a6 100644
--- a/src/test/regress/sql/reltime.sql
+++ b/src/test/regress/sql/reltime.sql
@@ -20,7 +20,7 @@ INSERT INTO RELTIME_TBL (f1) VALUES ('@ 30 eons ago');
 
 -- test reltime operators
 
-SELECT '' AS eight, RELTIME_TBL.*;
+SELECT '' AS six, RELTIME_TBL.*;
 
 SELECT '' AS five, RELTIME_TBL.*
    WHERE RELTIME_TBL.f1 <> '@ 10 days'::reltime;
-- 
2.11.0