From ab57e09e1cae19070ca82fa86a19de8f66ba2bed Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Tue, 6 Aug 1996 16:51:35 +0000
Subject: [PATCH] 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>
---
src/test/regress/Makefile | 7 ++++---
src/test/regress/expected.input | 16 ++++++++--------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/test/regress/Makefile b/src/test/regress/Makefile
index effb49bac1c..e45981fed59 100644
--- a/src/test/regress/Makefile
+++ b/src/test/regress/Makefile
@@ -7,7 +7,7 @@
#
#
# 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
rm -f $(objdir)/expected.out; \
C="`pwd`"; \
sed -e "s:_CWD_:$$C:g" \
- -e "s:_OBJWD_:$$C/$(objdir):g" \
- -e "s/_USER_/$$USER/g" < expected.input > $(objdir)/expected.out
+ -e "s:_OBJWD_:$$C/$(objdir):g" \
+ -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)
diff --git a/src/test/regress/expected.input b/src/test/regress/expected.input
index 488e6f4488c..82ec47eee93 100644
--- 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.so'
+ AS '_CWD_/obj/regress_SLSUFF_'
LANGUAGE 'c';
NOTICE:ProcedureCreate: type 'circle' is not yet defined
QUERY: CREATE FUNCTION circle_out(opaque)
RETURNS opaque
- AS '_CWD_/obj/regress.so'
+ AS '_CWD_/obj/regress_SLSUFF_'
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.so'
+ AS '_CWD_/obj/regress_SLSUFF_'
LANGUAGE 'c';
QUERY: CREATE FUNCTION overpaid(emp)
RETURNS bool
- AS '_CWD_/obj/regress.so'
+ AS '_CWD_/obj/regress_SLSUFF_'
LANGUAGE 'c';
QUERY: CREATE FUNCTION boxarea(box)
RETURNS int4
- AS '_CWD_/obj/regress.so'
+ AS '_CWD_/obj/regress_SLSUFF_'
LANGUAGE 'c';
QUERY: CREATE FUNCTION interpt_pp(path, path)
RETURNS point
- AS '_CWD_/obj/regress.so'
+ AS '_CWD_/obj/regress_SLSUFF_'
LANGUAGE 'c';
QUERY: CREATE FUNCTION reverse_c16(char16)
RETURNS char16
- AS '_CWD_/obj/regress.so'
+ AS '_CWD_/obj/regress_SLSUFF_'
LANGUAGE 'c';
-QUERY: LOAD '_CWD_/obj/regress.so'
+QUERY: LOAD '_CWD_/obj/regress_SLSUFF_'
COPY onek FROM '_CWD_/data/onek.data';
QUERY: COPY tenk1 FROM '_CWD_/data/tenk.data';
QUERY: INSERT INTO tenk2 VALUES (tenk1.*);
--
GitLab