Skip to content

Commit 3e1933b

Browse files
vadim4ovadim4o
committed
There is no more _CWD_ tag in sources...
1 parent 7cbfb19 commit 3e1933b

File tree

5 files changed

+34
-36
lines changed

5 files changed

+34
-36
lines changed

‎src/test/regress/input/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/test/regress/input/Attic/Makefile,v 1.4 1997/04/27 02:58:15 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/test/regress/input/Attic/Makefile,v 1.5 1997/05/05 06:53:31 vadim Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -30,9 +30,7 @@ all: $(INFILES)
3030
if [ -z "$$USER" ]; then USER=`whoami`; fi; \
3131
if [ -z "$$USER" ]; then echo 'Cannot deduce $$USER.'; exit 1; fi; \
3232
rm -f $@; \
33-
PWD=`pwd`; \
3433
OBJ=`pwd`; \
35-
sed -e "s:_CWD_:$(PWD):g" \
36-
-e "s:_OBJWD_:$$OBJ/\.\.:g" \
34+
sed -e "s:_OBJWD_:$$OBJ/\.\.:g" \
3735
-e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
3836
-e "s/_USER_/$$USER/g" < $< > ../sql/$@

‎src/test/regress/input/copy.source

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,49 +6,51 @@
66
-- CLASS POPULATION
77
-- (any resemblance to real life is purely coincidental)
88
--
9-
COPY onek FROM '_CWD_/data/onek.data';
9+
COPY aggtest FROM '_OBJWD_/data/agg.data';
1010

11-
COPY onek TO '_CWD_/results/onek.data';
11+
COPY onek FROM '_OBJWD_/data/onek.data';
12+
13+
COPY onek TO '_OBJWD_/results/onek.data';
1214

1315
DELETE FROM onek;
1416

15-
COPY onek FROM '_CWD_/results/onek.data';
17+
COPY onek FROM '_OBJWD_/results/onek.data';
1618

17-
COPY tenk1 FROM '_CWD_/data/tenk.data';
19+
COPY tenk1 FROM '_OBJWD_/data/tenk.data';
1820

19-
COPY slow_emp4000 FROM '_CWD_/data/rect.data';
21+
COPY slow_emp4000 FROM '_OBJWD_/data/rect.data';
2022

21-
COPY person FROM '_CWD_/data/person.data';
23+
COPY person FROM '_OBJWD_/data/person.data';
2224

23-
COPY emp FROM '_CWD_/data/emp.data';
25+
COPY emp FROM '_OBJWD_/data/emp.data';
2426

25-
COPY student FROM '_CWD_/data/student.data';
27+
COPY student FROM '_OBJWD_/data/student.data';
2628

27-
COPY stud_emp FROM '_CWD_/data/stud_emp.data';
29+
COPY stud_emp FROM '_OBJWD_/data/stud_emp.data';
2830

29-
COPY road FROM '_CWD_/data/streets.data';
31+
COPY road FROM '_OBJWD_/data/streets.data';
3032

31-
COPY real_city FROM '_CWD_/data/real_city.data';
33+
COPY real_city FROM '_OBJWD_/data/real_city.data';
3234

33-
COPY hash_i4_heap FROM '_CWD_/data/hash.data';
35+
COPY hash_i4_heap FROM '_OBJWD_/data/hash.data';
3436

35-
COPY hash_c16_heap FROM '_CWD_/data/hash.data';
37+
COPY hash_c16_heap FROM '_OBJWD_/data/hash.data';
3638

37-
COPY hash_txt_heap FROM '_CWD_/data/hash.data';
39+
COPY hash_txt_heap FROM '_OBJWD_/data/hash.data';
3840

39-
COPY hash_f8_heap FROM '_CWD_/data/hash.data';
41+
COPY hash_f8_heap FROM '_OBJWD_/data/hash.data';
4042

4143
-- the data in this file has a lot of duplicates in the index key
4244
-- fields, leading to long bucket chains and lots of table expansion.
4345
-- this is therefore a stress test of the bucket overflow code (unlike
4446
-- the data in hash.data, which has unique index keys).
4547
--
46-
-- COPY hash_ovfl_heap FROM '_CWD_/data/hashovfl.data';
48+
-- COPY hash_ovfl_heap FROM '_OBJWD_/data/hashovfl.data';
4749

48-
COPY bt_i4_heap FROM '_CWD_/data/desc.data';
50+
COPY bt_i4_heap FROM '_OBJWD_/data/desc.data';
4951

50-
COPY bt_c16_heap FROM '_CWD_/data/hash.data';
52+
COPY bt_c16_heap FROM '_OBJWD_/data/hash.data';
5153

52-
COPY bt_txt_heap FROM '_CWD_/data/desc.data';
54+
COPY bt_txt_heap FROM '_OBJWD_/data/desc.data';
5355

54-
COPY bt_f8_heap FROM '_CWD_/data/hash.data';
56+
COPY bt_f8_heap FROM '_OBJWD_/data/hash.data';

‎src/test/regress/input/create_function_1.source

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
CREATE FUNCTION widget_in(opaque)
77
RETURNS widget
8-
AS '_CWD_/../regress_DLSUFFIX_'
8+
AS '_OBJWD_/regress_DLSUFFIX_'
99
LANGUAGE 'c';
1010

1111
CREATE FUNCTION widget_out(opaque)
1212
RETURNS opaque
13-
AS '_CWD_/../regress_DLSUFFIX_'
13+
AS '_OBJWD_/regress_DLSUFFIX_'
1414
LANGUAGE 'c';
1515

‎src/test/regress/input/create_function_2.source

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,31 +29,31 @@ CREATE FUNCTION user_relns()
2929

3030
CREATE FUNCTION pt_in_widget(point, widget)
3131
RETURNS int4
32-
AS '_CWD_/regress_DLSUFFIX_'
32+
AS '_OBJWD_/regress_DLSUFFIX_'
3333
LANGUAGE 'c';
3434

3535
CREATE FUNCTION overpaid(emp)
3636
RETURNS bool
37-
AS '_CWD_/regress_DLSUFFIX_'
37+
AS '_OBJWD_/regress_DLSUFFIX_'
3838
LANGUAGE 'c';
3939

4040
CREATE FUNCTION boxarea(box)
4141
RETURNS int4
42-
AS '_CWD_/regress_DLSUFFIX_'
42+
AS '_OBJWD_/regress_DLSUFFIX_'
4343
LANGUAGE 'c';
4444

4545
CREATE FUNCTION interpt_pp(path, path)
4646
RETURNS point
47-
AS '_CWD_/regress_DLSUFFIX_'
47+
AS '_OBJWD_/regress_DLSUFFIX_'
4848
LANGUAGE 'c';
4949

5050
CREATE FUNCTION reverse_c16(char16)
5151
RETURNS char16
52-
AS '_CWD_/regress_DLSUFFIX_'
52+
AS '_OBJWD_/regress_DLSUFFIX_'
5353
LANGUAGE 'c';
5454

5555
--
5656
-- FUNCTION DYNAMIC LOADING
5757
--
58-
LOAD '_CWD_/regress_DLSUFFIX_';
58+
LOAD '_OBJWD_/regress_DLSUFFIX_';
5959

‎src/test/regress/output/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/test/regress/output/Attic/Makefile,v 1.6 1997/05/02 13:43:14 thomas Exp $
10+
# $Header: /cvsroot/pgsql/src/test/regress/output/Attic/Makefile,v 1.7 1997/05/05 06:52:58 vadim Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -30,10 +30,8 @@ all: $(INFILES)
3030
if [ -z "$$USER" ]; then USER=`whoami`; fi; \
3131
if [ -z "$$USER" ]; then echo 'Cannot deduce $$USER.'; exit 1; fi; \
3232
rm -f $@; \
33-
PWD=`pwd`; \
3433
OBJ=`pwd`; \
35-
sed -e "s:_CWD_:$$PWD:g" \
36-
-e "s:_OBJWD_:$$OBJ/\.\.:g" \
34+
sed -e "s:_OBJWD_:$$OBJ/\.\.:g" \
3735
-e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
3836
-e "s/_USER_/$$USER/g" < $< | \
3937
sed -e "s:output/\.\.:input/\.\.:g" > ../expected/$@

0 commit comments

Comments
 (0)