From 3e1933bc05565a41bcfab196c0c98996223368e7 Mon Sep 17 00:00:00 2001 From: "Vadim B. Mikheev" Date: Mon, 5 May 1997 06:53:36 +0000 Subject: [PATCH] There is no more _CWD_ tag in sources... --- src/test/regress/input/Makefile | 6 +-- src/test/regress/input/copy.source | 42 ++++++++++--------- .../regress/input/create_function_1.source | 4 +- .../regress/input/create_function_2.source | 12 +++--- src/test/regress/output/Makefile | 6 +-- 5 files changed, 34 insertions(+), 36 deletions(-) diff --git a/src/test/regress/input/Makefile b/src/test/regress/input/Makefile index 716e7a4aa6..6b9e3dc41e 100644 --- a/src/test/regress/input/Makefile +++ b/src/test/regress/input/Makefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/test/regress/input/Attic/Makefile,v 1.4 1997/04/27 02:58:15 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/test/regress/input/Attic/Makefile,v 1.5 1997/05/05 06:53:31 vadim Exp $ # #------------------------------------------------------------------------- @@ -30,9 +30,7 @@ all: $(INFILES) if [ -z "$$USER" ]; then USER=`whoami`; fi; \ if [ -z "$$USER" ]; then echo 'Cannot deduce $$USER.'; exit 1; fi; \ rm -f $@; \ - PWD=`pwd`; \ OBJ=`pwd`; \ - sed -e "s:_CWD_:$(PWD):g" \ - -e "s:_OBJWD_:$$OBJ/\.\.:g" \ + sed -e "s:_OBJWD_:$$OBJ/\.\.:g" \ -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \ -e "s/_USER_/$$USER/g" < $< > ../sql/$@ diff --git a/src/test/regress/input/copy.source b/src/test/regress/input/copy.source index 6cdc671436..1c93759ec2 100644 --- a/src/test/regress/input/copy.source +++ b/src/test/regress/input/copy.source @@ -6,49 +6,51 @@ -- CLASS POPULATION -- (any resemblance to real life is purely coincidental) -- -COPY onek FROM '_CWD_/data/onek.data'; +COPY aggtest FROM '_OBJWD_/data/agg.data'; -COPY onek TO '_CWD_/results/onek.data'; +COPY onek FROM '_OBJWD_/data/onek.data'; + +COPY onek TO '_OBJWD_/results/onek.data'; DELETE FROM onek; -COPY onek FROM '_CWD_/results/onek.data'; +COPY onek FROM '_OBJWD_/results/onek.data'; -COPY tenk1 FROM '_CWD_/data/tenk.data'; +COPY tenk1 FROM '_OBJWD_/data/tenk.data'; -COPY slow_emp4000 FROM '_CWD_/data/rect.data'; +COPY slow_emp4000 FROM '_OBJWD_/data/rect.data'; -COPY person FROM '_CWD_/data/person.data'; +COPY person FROM '_OBJWD_/data/person.data'; -COPY emp FROM '_CWD_/data/emp.data'; +COPY emp FROM '_OBJWD_/data/emp.data'; -COPY student FROM '_CWD_/data/student.data'; +COPY student FROM '_OBJWD_/data/student.data'; -COPY stud_emp FROM '_CWD_/data/stud_emp.data'; +COPY stud_emp FROM '_OBJWD_/data/stud_emp.data'; -COPY road FROM '_CWD_/data/streets.data'; +COPY road FROM '_OBJWD_/data/streets.data'; -COPY real_city FROM '_CWD_/data/real_city.data'; +COPY real_city FROM '_OBJWD_/data/real_city.data'; -COPY hash_i4_heap FROM '_CWD_/data/hash.data'; +COPY hash_i4_heap FROM '_OBJWD_/data/hash.data'; -COPY hash_c16_heap FROM '_CWD_/data/hash.data'; +COPY hash_c16_heap FROM '_OBJWD_/data/hash.data'; -COPY hash_txt_heap FROM '_CWD_/data/hash.data'; +COPY hash_txt_heap FROM '_OBJWD_/data/hash.data'; -COPY hash_f8_heap FROM '_CWD_/data/hash.data'; +COPY hash_f8_heap FROM '_OBJWD_/data/hash.data'; -- the data in this file has a lot of duplicates in the index key -- fields, leading to long bucket chains and lots of table expansion. -- this is therefore a stress test of the bucket overflow code (unlike -- the data in hash.data, which has unique index keys). -- --- COPY hash_ovfl_heap FROM '_CWD_/data/hashovfl.data'; +-- COPY hash_ovfl_heap FROM '_OBJWD_/data/hashovfl.data'; -COPY bt_i4_heap FROM '_CWD_/data/desc.data'; +COPY bt_i4_heap FROM '_OBJWD_/data/desc.data'; -COPY bt_c16_heap FROM '_CWD_/data/hash.data'; +COPY bt_c16_heap FROM '_OBJWD_/data/hash.data'; -COPY bt_txt_heap FROM '_CWD_/data/desc.data'; +COPY bt_txt_heap FROM '_OBJWD_/data/desc.data'; -COPY bt_f8_heap FROM '_CWD_/data/hash.data'; +COPY bt_f8_heap FROM '_OBJWD_/data/hash.data'; diff --git a/src/test/regress/input/create_function_1.source b/src/test/regress/input/create_function_1.source index 41e76604b0..88c4127f7b 100644 --- a/src/test/regress/input/create_function_1.source +++ b/src/test/regress/input/create_function_1.source @@ -5,11 +5,11 @@ CREATE FUNCTION widget_in(opaque) RETURNS widget - AS '_CWD_/../regress_DLSUFFIX_' + AS '_OBJWD_/regress_DLSUFFIX_' LANGUAGE 'c'; CREATE FUNCTION widget_out(opaque) RETURNS opaque - AS '_CWD_/../regress_DLSUFFIX_' + AS '_OBJWD_/regress_DLSUFFIX_' LANGUAGE 'c'; diff --git a/src/test/regress/input/create_function_2.source b/src/test/regress/input/create_function_2.source index d332fc7c70..6a23c53c36 100644 --- a/src/test/regress/input/create_function_2.source +++ b/src/test/regress/input/create_function_2.source @@ -29,31 +29,31 @@ CREATE FUNCTION user_relns() CREATE FUNCTION pt_in_widget(point, widget) RETURNS int4 - AS '_CWD_/regress_DLSUFFIX_' + AS '_OBJWD_/regress_DLSUFFIX_' LANGUAGE 'c'; CREATE FUNCTION overpaid(emp) RETURNS bool - AS '_CWD_/regress_DLSUFFIX_' + AS '_OBJWD_/regress_DLSUFFIX_' LANGUAGE 'c'; CREATE FUNCTION boxarea(box) RETURNS int4 - AS '_CWD_/regress_DLSUFFIX_' + AS '_OBJWD_/regress_DLSUFFIX_' LANGUAGE 'c'; CREATE FUNCTION interpt_pp(path, path) RETURNS point - AS '_CWD_/regress_DLSUFFIX_' + AS '_OBJWD_/regress_DLSUFFIX_' LANGUAGE 'c'; CREATE FUNCTION reverse_c16(char16) RETURNS char16 - AS '_CWD_/regress_DLSUFFIX_' + AS '_OBJWD_/regress_DLSUFFIX_' LANGUAGE 'c'; -- -- FUNCTION DYNAMIC LOADING -- -LOAD '_CWD_/regress_DLSUFFIX_'; +LOAD '_OBJWD_/regress_DLSUFFIX_'; diff --git a/src/test/regress/output/Makefile b/src/test/regress/output/Makefile index fb8d587381..a792733bf3 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.6 1997/05/02 13:43:14 thomas Exp $ +# $Header: /cvsroot/pgsql/src/test/regress/output/Attic/Makefile,v 1.7 1997/05/05 06:52:58 vadim Exp $ # #------------------------------------------------------------------------- @@ -30,10 +30,8 @@ all: $(INFILES) if [ -z "$$USER" ]; then USER=`whoami`; fi; \ if [ -z "$$USER" ]; then echo 'Cannot deduce $$USER.'; exit 1; fi; \ rm -f $@; \ - PWD=`pwd`; \ OBJ=`pwd`; \ - sed -e "s:_CWD_:$$PWD:g" \ - -e "s:_OBJWD_:$$OBJ/\.\.:g" \ + sed -e "s:_OBJWD_:$$OBJ/\.\.:g" \ -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \ -e "s/_USER_/$$USER/g" < $< | \ sed -e "s:output/\.\.:input/\.\.:g" > ../expected/$@ -- 2.40.0