From a475d4d89cf8699417e10cd189ab0146d8e4d948 Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Sun, 27 Apr 1997 04:50:06 +0000
Subject: [PATCH] Get first four tests to pass:
=============== destroying old regression database... =================
=============== creating new regression database... =================
=============== running regression queries... =================
create_function_1 .. ok
create_type .. ok
create_table .. ok
create_function_2 .. ok
---
src/test/regress/input/copy.source | 6 +++++
.../regress/input/create_function_2.source | 14 ++++++------
src/test/regress/output/Makefile | 22 ++++++++-----------
3 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/src/test/regress/input/copy.source b/src/test/regress/input/copy.source
index cf8e06cd34f..3cc0bf5a83c 100644
--- a/src/test/regress/input/copy.source
+++ b/src/test/regress/input/copy.source
@@ -8,6 +8,12 @@
--
COPY onek FROM '_CWD_/../data/onek.data';
+COPY onek TO '_OBJWD_/results/onek.data';
+
+DELETE FROM onek;
+
+COPY onek FROM '_OBJWD_/results/onek.data';
+
COPY tenk1 FROM '_CWD_/../data/tenk.data';
COPY slow_emp4000 FROM '_CWD_/../data/rect.data';
diff --git a/src/test/regress/input/create_function_2.source b/src/test/regress/input/create_function_2.source
index d98f4fd8fab..d332fc7c700 100644
--- a/src/test/regress/input/create_function_2.source
+++ b/src/test/regress/input/create_function_2.source
@@ -27,33 +27,33 @@ CREATE FUNCTION user_relns()
relkind <> ''i'' '
LANGUAGE 'sql';
-CREATE FUNCTION pt_in_circle(point, circle)
+CREATE FUNCTION pt_in_widget(point, widget)
RETURNS int4
- AS '_OBJWD_/regress_DLSUFFIX_'
+ AS '_CWD_/regress_DLSUFFIX_'
LANGUAGE 'c';
CREATE FUNCTION overpaid(emp)
RETURNS bool
- AS '_OBJWD_/regress_DLSUFFIX_'
+ AS '_CWD_/regress_DLSUFFIX_'
LANGUAGE 'c';
CREATE FUNCTION boxarea(box)
RETURNS int4
- AS '_OBJWD_/regress_DLSUFFIX_'
+ AS '_CWD_/regress_DLSUFFIX_'
LANGUAGE 'c';
CREATE FUNCTION interpt_pp(path, path)
RETURNS point
- AS '_OBJWD_/regress_DLSUFFIX_'
+ AS '_CWD_/regress_DLSUFFIX_'
LANGUAGE 'c';
CREATE FUNCTION reverse_c16(char16)
RETURNS char16
- AS '_OBJWD_/regress_DLSUFFIX_'
+ AS '_CWD_/regress_DLSUFFIX_'
LANGUAGE 'c';
--
-- FUNCTION DYNAMIC LOADING
--
-LOAD '_OBJWD_/regress_DLSUFFIX_';
+LOAD '_CWD_/regress_DLSUFFIX_';
diff --git a/src/test/regress/output/Makefile b/src/test/regress/output/Makefile
index 3e8bb77463a..57e87984aa5 100644
--- a/src/test/regress/output/Makefile
+++ b/src/test/regress/output/Makefile
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/test/regress/output/Attic/Makefile,v 1.3 1997/04/26 05:45:13 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/output/Attic/Makefile,v 1.4 1997/04/27 04:50:06 scrappy Exp $
#
#-------------------------------------------------------------------------
@@ -28,15 +28,11 @@ all: $(INFILES)
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_:$(PWD)/\.\.:g" \
- -e "s:\.\./output:\.\./input:g" \
- -e "s:_OBJWD_:$(PWD):g" \
- -e "s:_DLSUFFIX_:$(DLSUFFIX):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] [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" < $< | \
- sed -e "s:/output/\.\./:/input/\.\./:g"> ../expected/$@
- @echo "YOUR EXPECTED RESULTS ARE NOW IN FILE expected.out."
+ rm -f $@; \
+ PWD=`pwd`; \
+ OBJ=`pwd`; \
+ sed -e "s:_CWD_:$(PWD):g" \
+ -e "s:_OBJWD_:$$OBJ/\.\.:g" \
+ -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
+ -e "s/_USER_/$$USER/g" < $< > ../expected/$@
+
--
GitLab