There is no more _CWD_ tag in sources...

diff --git a/src/test/regress/input/Makefile b/src/test/regress/input/Makefile
index 716e7a4aa6ccc2ab507c249528a850bf5aa65d78..6b9e3dc41e497f3d613bb47c2a7366be46caf292 100644 (file)
--- 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 6cdc67143652ef70a012d8646a7cd75200d164bb..1c93759ec20b78919b9458ea028e4186ff37c94f 100644 (file)
--- 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 41e76604b0cab9a45ff00ff26fbe1fa839514c27..88c4127f7b1b0c52312de571930348afff531f53 100644 (file)
--- 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 d332fc7c700e160576200c9a87e7e0857948ddc5..6a23c53c36a5bdb3a7ba5aa65eb407f2f7ac5798 100644 (file)
--- 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 fb8d587381bfea55382370134738c98cfe69067a..a792733bf3990e09c1c6508e8d708d14c188540f 100644 (file)
--- 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/$@