Reduce regression diff size with timezone changes and cleanup.

5f9bdb76 · Bruce Momjian · 7980b8a5 · 5f9bdb76 · 5f9bdb76 · 5f9bdb76
Commit 5f9bdb76 authored Dec 02, 1996 by Bruce Momjian
4 changed files
--- a/src/test/regress/Makefile
+++ b/src/test/regress/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.10 1996/11/18 06:07:29 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.11 1996/12/02 06:31:08 momjian Exp $
 #
 #-------------------------------------------------------------------------

@@ -60,17 +60,21 @@ runtest: $(INFILES) expected.out
 # turns those names back into real values for the instant installation to
 # create a standard (expected.out) against which to compare regress.out 
 # from the experimental run.
-
+#
+#
 expected.out: expected.input
 	if [ -z "$$USER" ]; then USER=$$LOGNAME; fi; \
 	if [ -z "$$USER" ]; then USER=`whoami`; fi; \
 	if [ -z "$$USER" ]; then echo 'Cannot deduce $USER.'; exit 1; fi; \
 	rm -f expected.out; \
+	MYTZ=`date | cut -c21`; \
 	C="`pwd`"; \
 	sed -e "s:_CWD_:$$C:g" \
 	    -e "s:_OBJWD_:$$C:g" \
            -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
-	    -e "s/_USER_/$$USER/g" < expected.input > expected.out
+	    -e "s;\([A-Z][a-z][a-z][^ ]* [A-Z][a-z][a-z] [0-9 ][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9][0-9][0-9][0-9] \)[A-Z]\([A-Z][A-Z]\);\1$$MYTZ\2;g" \
+	    -e "s;\([A-Z][a-z][a-z][^ ]* [A-Z][a-z][a-z] [0-9 ][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9] \)[A-Z]\([A-Z][A-Z] [0-9][0-9][0-9][0-9]\);\1$$MYTZ\2;g" \
+	    -e "s:_USER_:$$USER:g" < expected.input > expected.out
 	@echo "YOUR EXPECTED RESULTS ARE NOW IN FILE expected.out."

 %.sql: %.source

--- a/src/test/regress/README
+++ b/src/test/regress/README
@@ -10,9 +10,9 @@ Preparation

  The regression test is invoked thru by the 'make' command which compiles
  a 'c' program with Postgres95 extension functions into a shared library
-  in the 'obj' directory.  Localised shell scripts are also created in
-  the 'obj' directory. The 'expected.input' file is massaged into the
-  'obj/expected.out' file.  The localization replaces macros in the source
+  in the current directory.  Localized shell scripts are also created in
+  the current directory. The 'expected.input' file is massaged into the
+  'expected.out' file.  The localization replaces macros in the source
  files with absolute pathnames and user names.

 The 'expected.input' file and the 'sample.regress.out' file
@@ -46,12 +46,12 @@ Running the regression test
  Normally, the regression test should be run as the 'postgres' user as the
  'src/test/regress' directory and sub-directories are owned by the
  'postgres' user. If you run the regression test as another user the
-  'src/test/regress/obj' directory should be writeable to that user.
+  'src/test/regress' directory should be writeable to that user.

 Comparing expected/actual output

-  The results are in the file 'obj/regress.out' which can be compared
-  with the 'obj/expected.out' file using 'diff'. The files will NOT
+  The results are in the file 'regress.out' which can be compared
+  with the 'expected.out' file using 'diff'. The files will NOT
  compare exactly. The following paragraphs attempt to explain the
  differences.

@@ -110,3 +110,12 @@ POLYGON differences
    QUERY: SELECT * from street;
    QUERY: SELECT * from iexit;

+DATE/TIME differences
+
+  The Makefile attempts to adjust for timezone differences, but it is
+  totally possible to eliminate them.  People outside North America
+  will probabablly find the Makefile's adjustments are incorrect.  Also
+  entries that use the time -infinity display with year 1970 plus/minus the
+  number of hours you are different from GMT.
+
+
--- a/src/test/regress/expected.input
+++ b/src/test/regress/expected.input
@@ -4,12 +4,12 @@ destroydb: database destroy failed on regression.
 =============== creating new regression database... =================
 QUERY: CREATE FUNCTION circle_in(opaque)
   RETURNS circle
-   AS '_CWD_/obj/regress_DLSUFFIX_'
+   AS '_CWD_/regress_DLSUFFIX_'
   LANGUAGE 'c';
 NOTICE:ProcedureCreate: type 'circle' is not yet defined
 QUERY: CREATE FUNCTION circle_out(opaque)
   RETURNS opaque
-   AS '_CWD_/obj/regress_DLSUFFIX_'
+   AS '_CWD_/regress_DLSUFFIX_'
   LANGUAGE 'c';
 QUERY: CREATE TYPE circle (
   internallength = 24,
@@ -211,25 +211,25 @@ QUERY: CREATE FUNCTION user_relns()
   LANGUAGE 'sql';
 QUERY: CREATE FUNCTION pt_in_circle(point, circle)
   RETURNS int4
-   AS '_CWD_/obj/regress_DLSUFFIX_'
+   AS '_CWD_/regress_DLSUFFIX_'
   LANGUAGE 'c';
 QUERY: CREATE FUNCTION overpaid(emp)
   RETURNS bool
-   AS '_CWD_/obj/regress_DLSUFFIX_'
+   AS '_CWD_/regress_DLSUFFIX_'
   LANGUAGE 'c';
 QUERY: CREATE FUNCTION boxarea(box)
   RETURNS int4
-   AS '_CWD_/obj/regress_DLSUFFIX_'
+   AS '_CWD_/regress_DLSUFFIX_'
   LANGUAGE 'c';
 QUERY: CREATE FUNCTION interpt_pp(path, path)
   RETURNS point
-   AS '_CWD_/obj/regress_DLSUFFIX_'
+   AS '_CWD_/regress_DLSUFFIX_'
   LANGUAGE 'c';
 QUERY: CREATE FUNCTION reverse_c16(char16)
   RETURNS char16
-   AS '_CWD_/obj/regress_DLSUFFIX_'
+   AS '_CWD_/regress_DLSUFFIX_'
   LANGUAGE 'c';
-QUERY: LOAD '_CWD_/obj/regress_DLSUFFIX_'
+QUERY: LOAD '_CWD_/regress_DLSUFFIX_'
 COPY onek FROM '_CWD_/data/onek.data';
 QUERY: COPY tenk1 FROM '_CWD_/data/tenk.data';
 QUERY: INSERT INTO tenk2 VALUES (tenk1.*);
@@ -663,7 +663,7 @@ tf_12_ff_4|f1|f1

 QUERY: CREATE TABLE ABSTIME_TBL (f1 abstime);
 QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('Jan 14, 1973 03:14:21');
-QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('Mon May  1 00:30:30 PDT 1995'::abstime);
+QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('Mon May  1 00:30:30 1995'::abstime);
 QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('epoch'::abstime);
 QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('current'::abstime);
 QUERY: INSERT INTO ABSTIME_TBL (f1) VALUES ('infinity'::abstime);
@@ -690,7 +690,7 @@ QUERY: INSERT INTO TINTERVAL_TBL (f1)
 QUERY: INSERT INTO TINTERVAL_TBL (f1)
   VALUES ('["Sep 4, 1983 23:59:12" "Oct 4, 1983 23:59:12"]');
 QUERY: INSERT INTO TINTERVAL_TBL (f1)
-   VALUES ('["epoch" "Mon May  1 00:30:30 PDT 1995"]');
+   VALUES ('["epoch" "Mon May  1 00:30:30 1995"]');
 QUERY: INSERT INTO TINTERVAL_TBL (f1)
   VALUES ('["Feb 15 1990 12:15:03" "current"]');
 QUERY: INSERT INTO TINTERVAL_TBL (f1)
@@ -1194,7 +1194,7 @@ two|f1
 (2 rows)

 QUERY: SELECT '' AS two, b.f1
-   FROM BOX_TBL b				-- zero area
+   FROM BOX_TBL b				
   WHERE b.f1 > '(3.5,3.0,4.5,3.0)'::box;
 two|f1       
 ---+---------
@@ -1203,7 +1203,7 @@ two|f1
 (2 rows)

 QUERY: SELECT '' AS four, b.f1
-   FROM BOX_TBL b				-- zero area
+   FROM BOX_TBL b				
   WHERE b.f1 >= '(3.5,3.0,4.5,3.0)'::box;
 four|f1               
 ----+-----------------
@@ -1842,17 +1842,14 @@ three|f1         |x
 (3 rows)

 QUERY: SELECT '' AS three, f.f1, f.f1 + '-10' AS x FROM FLOAT4_TBL f
-   WHERE f.f1 > '0.0'
-SELECT '' AS three, f.f1, f.f1 / '-10' AS x FROM FLOAT4_TBL f
   WHERE f.f1 > '0.0';
 three|f1         |x          
 -----+-----------+-----------
     |1004.3     |994.3      
     |1.23457e+20|1.23457e+20
     |1.23457e-20|-10        
-(3 rows)

-QUERY: SELECT '' AS three, f.f1, f.f1 - '-10' AS x FROM FLOAT4_TBL f
+QUERY: SELECT '' AS three, f.f1, f.f1 / '-10' AS x FROM FLOAT4_TBL f
   WHERE f.f1 > '0.0';
 three|f1         |x           
 -----+-----------+------------
@@ -1861,7 +1858,8 @@ three|f1         |x
     |1.23457e-20|-1.23457e-21
 (3 rows)

-QUERY: SELECT '' AS bad, f.f1 / '0.0' from FLOAT4_TBL f;
+QUERY: SELECT '' AS three, f.f1, f.f1 - '-10' AS x FROM FLOAT4_TBL f
+   WHERE f.f1 > '0.0';
 three|f1         |x          
 -----+-----------+-----------
     |1004.3     |1014.3     
@@ -1869,9 +1867,9 @@ three|f1         |x
     |1.23457e-20|10         
 (3 rows)

-QUERY: SELECT '' AS five, FLOAT4_TBL.*;
+QUERY: SELECT '' AS bad, f.f1 / '0.0' from FLOAT4_TBL f;
 WARN:float4div:  divide by 0.0 error
-QUERY: SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT4_TBL f;
+QUERY: SELECT '' AS five, FLOAT4_TBL.*;
 five|f1         
 ----+-----------
    |0          
@@ -1881,9 +1879,7 @@ five|f1
    |1.23457e-20
 (5 rows)

-QUERY: UPDATE FLOAT4_TBL
-   SET f1 = FLOAT4_TBL.f1 * '-1'
-   WHERE FLOAT4_TBL.f1 > '0.0';
+QUERY: SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT4_TBL f;
 five|f1         |abs_f1     
 ----+-----------+-----------
    |0          |0          
@@ -1893,7 +1889,19 @@ five|f1         |abs_f1
    |1.23457e-20|1.23457e-20
 (5 rows)

+QUERY: UPDATE FLOAT4_TBL
+   SET f1 = FLOAT4_TBL.f1 * '-1'
+   WHERE FLOAT4_TBL.f1 > '0.0';
 QUERY: SELECT '' AS five, FLOAT4_TBL.*;
+five|f1          
+----+------------
+    |0           
+    |-34.84      
+    |-1004.3     
+    |-1.23457e+20
+    |-1.23457e-20
+(5 rows)
+
 QUERY: CREATE TABLE FLOAT8_TBL(f1 float8);
 QUERY: INSERT INTO FLOAT8_TBL(f1) VALUES ('0.0');
 QUERY: INSERT INTO FLOAT8_TBL(f1) VALUES ('1004.30');
@@ -3886,9 +3894,9 @@ f20000
 20000
 (1 row)

-QUERY: COPY onek TO '_CWD_/obj/onek.data';
+QUERY: COPY onek TO '_CWD_/onek.data';
 QUERY: DELETE FROM onek;
-QUERY: COPY onek FROM '_CWD_/obj/onek.data';
+QUERY: COPY onek FROM '_CWD_/onek.data';
 QUERY: SELECT unique1 FROM onek WHERE unique1 < 2;
 unique1
 -------
@@ -3897,7 +3905,7 @@ unique1
 (2 rows)

 QUERY: DELETE FROM onek2;
-QUERY: COPY onek2 FROM '_CWD_/obj/onek.data';
+QUERY: COPY onek2 FROM '_CWD_/onek.data';
 QUERY: SELECT unique1 FROM onek2 WHERE unique1 < 2;
 unique1
 -------
@@ -3905,9 +3913,9 @@ unique1
      0
 (2 rows)

-QUERY: COPY BINARY stud_emp TO '_CWD_/obj/stud_emp.data';
+QUERY: COPY BINARY stud_emp TO '_CWD_/stud_emp.data';
 QUERY: DELETE FROM stud_emp;
-QUERY: COPY BINARY stud_emp FROM '_CWD_/obj/stud_emp.data';
+QUERY: COPY BINARY stud_emp FROM '_CWD_/stud_emp.data';
 QUERY: SELECT * FROM stud_emp;
 name |age|location  |salary|manager|gpa|percent
 -----+---+----------+------+-------+---+-------
@@ -4762,7 +4770,7 @@ QUERY: CLOSE foo24;
 QUERY: CLOSE foo25;
 QUERY: END;
 QUERY: PURGE hash_f8_heap BEFORE 'now';
-SELECT count(*) AS has_10002 FROM hash_f8_heap[,] h;
+QUERY: SELECT count(*) AS has_10002 FROM hash_f8_heap[,] h;
 QUERY: VACUUM hash_f8_heap;
 QUERY: SELECT count(*) AS has_10000 FROM hash_f8_heap[,] h;
 has_10000
@@ -4771,12 +4779,17 @@ has_10000
 (1 row)

 QUERY: PURGE hash_i4_heap AFTER '@ 1 second ago';
-SELECT count(*) AS has_10002 FROM hash_i4_heap[,] h;
+QUERY: SELECT count(*) AS has_10002 FROM hash_i4_heap[,] h;
+has_10002
+---------
+    10002
+(1 row)
+
 QUERY: VACUUM hash_i4_heap;
 QUERY: SELECT count(*) AS has_10000 FROM hash_i4_heap[,] h;
 has_10000
 ---------
-    10002
+    10000
 (1 row)

 QUERY: CREATE TABLE temp (initial int4);
@@ -4809,7 +4822,7 @@ QUERY: ALTER TABLE temp ADD COLUMN z int2[];
 QUERY: INSERT INTO temp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t, u,
 	v, w, x, y, z)
   VALUES (4, 'char16', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)',
-        'Mon May  1 00:30:30 PDT 1995', 'c', '{Mon May  1 00:30:30 PDT 1995, Monday Aug 24 14:43:07 1992 PDT, epoch}',
+        'Mon May  1 00:30:30 1995', 'c', '{Mon May  1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}',
 	314159, '(1,1)', 512,
 	'1 2 3 4 5 6 7 8', 'magnetic disk', '(1.1,1.1)', '(4.1,4.1,3.1,3.1)',
 	'(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["current" "infinity"]',
@@ -4854,7 +4867,7 @@ QUERY: ALTER TABLE temp ADD COLUMN z int2[];
 QUERY: INSERT INTO temp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t, u,
 	v, w, x, y, z)
   VALUES (4, 'char16', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)',
-	'Mon May  1 00:30:30 PDT 1995', 'c', '{Mon May  1 00:30:30 PDT 1995, Monday Aug 24 14:43:07 1992 PDT, epoch}',
+	'Mon May  1 00:30:30 1995', 'c', '{Mon May  1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}',
 	 314159, '(1,1)', 512,
 	'1 2 3 4 5 6 7 8', 'magnetic disk', '(1.1,1.1)', '(4.1,4.1,3.1,3.1)',
 	'(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["current" "infinity"]',

--- a/src/test/regress/queries.source
+++ b/src/test/regress/queries.source
 --
 -- queries.source
 --
-- $Header: /cvsroot/pgsql/src/test/regress/Attic/queries.source,v 1.4 1996/11/14 16:09:26 momjian Exp $
+-- $Header: /cvsroot/pgsql/src/test/regress/Attic/queries.source,v 1.5 1996/12/02 06:31:20 momjian Exp $
 --
 -- The comments that contain sequences of UNIX commands generate the 
 -- desired output for the POSTQUEL statement(s).
@@ -115,7 +115,7 @@ CREATE TABLE ABSTIME_TBL (f1 abstime);
 INSERT INTO ABSTIME_TBL (f1) VALUES ('Jan 14, 1973 03:14:21');

 -- was INSERT INTO ABSTIME_TBL (f1) VALUES ('now'::abstime):
-INSERT INTO ABSTIME_TBL (f1) VALUES ('Mon May  1 00:30:30 PDT 1995'::abstime);
+INSERT INTO ABSTIME_TBL (f1) VALUES ('Mon May  1 00:30:30 1995'::abstime);

 INSERT INTO ABSTIME_TBL (f1) VALUES ('epoch'::abstime);

@@ -173,7 +173,7 @@ INSERT INTO TINTERVAL_TBL (f1)
   VALUES ('["Sep 4, 1983 23:59:12" "Oct 4, 1983 23:59:12"]');

 INSERT INTO TINTERVAL_TBL (f1)
-   VALUES ('["epoch" "Mon May  1 00:30:30 PDT 1995"]');
+   VALUES ('["epoch" "Mon May  1 00:30:30 1995"]');

 INSERT INTO TINTERVAL_TBL (f1)
   VALUES ('["Feb 15 1990 12:15:03" "current"]');
@@ -2273,7 +2273,7 @@ ALTER TABLE temp ADD COLUMN z int2[];
 INSERT INTO temp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t, u,
 	v, w, x, y, z)
   VALUES (4, 'char16', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)', 
-        'Mon May  1 00:30:30 PDT 1995', 'c', '{Mon May  1 00:30:30 PDT 1995, Monday Aug 24 14:43:07 1992 PDT, epoch}', 
+        'Mon May  1 00:30:30 1995', 'c', '{Mon May  1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}', 
 	314159, '(1,1)', 512,
 	'1 2 3 4 5 6 7 8', 'magnetic disk', '(1.1,1.1)', '(4.1,4.1,3.1,3.1)',
 	'(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["current" "infinity"]',
@@ -2342,7 +2342,7 @@ ALTER TABLE temp ADD COLUMN z int2[];
 INSERT INTO temp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t, u,
 	v, w, x, y, z)
   VALUES (4, 'char16', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)', 
-	'Mon May  1 00:30:30 PDT 1995', 'c', '{Mon May  1 00:30:30 PDT 1995, Monday Aug 24 14:43:07 1992 PDT, epoch}',
+	'Mon May  1 00:30:30 1995', 'c', '{Mon May  1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}',
 	 314159, '(1,1)', 512,
 	'1 2 3 4 5 6 7 8', 'magnetic disk', '(1.1,1.1)', '(4.1,4.1,3.1,3.1)',
 	'(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["current" "infinity"]',