Commit ab57e09e authored by Marc G. Fournier's avatar Marc G. Fournier

Fixes:

Also, I think that an extra source of noise in the diff of regress.out and
expected.out is caused by not substituting the shared library file
extension in the regression.input file (much like the paths and the
usernames are sub'ed). This seems to be fixed with the following patches
to regression.input and the Makefile... If I'm off base here, please tell!

Submitted by:  Wayde Nie <niew@phoenix.cis.mcmaster.ca>
parent bb0bdfd1
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.5 1996/07/26 20:15:40 scrappy Exp $ # $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.6 1996/08/06 16:51:17 scrappy Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -58,8 +58,9 @@ expected.out: expected.input ...@@ -58,8 +58,9 @@ expected.out: expected.input
rm -f $(objdir)/expected.out; \ rm -f $(objdir)/expected.out; \
C="`pwd`"; \ C="`pwd`"; \
sed -e "s:_CWD_:$$C:g" \ sed -e "s:_CWD_:$$C:g" \
-e "s:_OBJWD_:$$C/$(objdir):g" \ -e "s:_OBJWD_:$$C/$(objdir):g" \
-e "s/_USER_/$$USER/g" < expected.input > $(objdir)/expected.out -e "s:_SLSUFF_:$(SLSUFF):g" \
-e "s/_USER_/$$USER/g" < expected.input > $(objdir)/expected.out
# #
# prepare to run the test (including clean-up after the last run) # prepare to run the test (including clean-up after the last run)
......
...@@ -4,12 +4,12 @@ destroydb: database destroy failed on regression. ...@@ -4,12 +4,12 @@ destroydb: database destroy failed on regression.
=============== creating new regression database... ================= =============== creating new regression database... =================
QUERY: CREATE FUNCTION circle_in(opaque) QUERY: CREATE FUNCTION circle_in(opaque)
RETURNS circle RETURNS circle
AS '_CWD_/obj/regress.so' AS '_CWD_/obj/regress_SLSUFF_'
LANGUAGE 'c'; LANGUAGE 'c';
NOTICE:ProcedureCreate: type 'circle' is not yet defined NOTICE:ProcedureCreate: type 'circle' is not yet defined
QUERY: CREATE FUNCTION circle_out(opaque) QUERY: CREATE FUNCTION circle_out(opaque)
RETURNS opaque RETURNS opaque
AS '_CWD_/obj/regress.so' AS '_CWD_/obj/regress_SLSUFF_'
LANGUAGE 'c'; LANGUAGE 'c';
QUERY: CREATE TYPE circle ( QUERY: CREATE TYPE circle (
internallength = 24, internallength = 24,
...@@ -211,25 +211,25 @@ QUERY: CREATE FUNCTION user_relns() ...@@ -211,25 +211,25 @@ QUERY: CREATE FUNCTION user_relns()
LANGUAGE 'sql'; LANGUAGE 'sql';
QUERY: CREATE FUNCTION pt_in_circle(point, circle) QUERY: CREATE FUNCTION pt_in_circle(point, circle)
RETURNS int4 RETURNS int4
AS '_CWD_/obj/regress.so' AS '_CWD_/obj/regress_SLSUFF_'
LANGUAGE 'c'; LANGUAGE 'c';
QUERY: CREATE FUNCTION overpaid(emp) QUERY: CREATE FUNCTION overpaid(emp)
RETURNS bool RETURNS bool
AS '_CWD_/obj/regress.so' AS '_CWD_/obj/regress_SLSUFF_'
LANGUAGE 'c'; LANGUAGE 'c';
QUERY: CREATE FUNCTION boxarea(box) QUERY: CREATE FUNCTION boxarea(box)
RETURNS int4 RETURNS int4
AS '_CWD_/obj/regress.so' AS '_CWD_/obj/regress_SLSUFF_'
LANGUAGE 'c'; LANGUAGE 'c';
QUERY: CREATE FUNCTION interpt_pp(path, path) QUERY: CREATE FUNCTION interpt_pp(path, path)
RETURNS point RETURNS point
AS '_CWD_/obj/regress.so' AS '_CWD_/obj/regress_SLSUFF_'
LANGUAGE 'c'; LANGUAGE 'c';
QUERY: CREATE FUNCTION reverse_c16(char16) QUERY: CREATE FUNCTION reverse_c16(char16)
RETURNS char16 RETURNS char16
AS '_CWD_/obj/regress.so' AS '_CWD_/obj/regress_SLSUFF_'
LANGUAGE 'c'; LANGUAGE 'c';
QUERY: LOAD '_CWD_/obj/regress.so' QUERY: LOAD '_CWD_/obj/regress_SLSUFF_'
COPY onek FROM '_CWD_/data/onek.data'; COPY onek FROM '_CWD_/data/onek.data';
QUERY: COPY tenk1 FROM '_CWD_/data/tenk.data'; QUERY: COPY tenk1 FROM '_CWD_/data/tenk.data';
QUERY: INSERT INTO tenk2 VALUES (tenk1.*); QUERY: INSERT INTO tenk2 VALUES (tenk1.*);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment