Skip to content

Commit ba1a589

Browse files
scrappyscrappy
committed
Clean out/up some files that are causing me great headaches since I didn't
do this completely last time and Thomas is creating patches on files that aren't supposed to exist :(
1 parent c2ae467 commit ba1a589

File tree

8 files changed

+67
-268
lines changed

8 files changed

+67
-268
lines changed

‎src/test/regress/GNUmakefile

Lines changed: 5 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.4 1997/04/12 09:34:31 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.5 1997/04/26 05:44:06 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ../..
1515
include ../../Makefile.global
1616

17-
CFLAGS+= -I$(LIBPQDIR) -I../../include
17+
CFLAGS+= -I$(LIBPQDIR)
1818

1919
LDADD+= -L$(LIBPQDIR) -lpq
2020

@@ -37,59 +37,21 @@ ifdef EXPSUFF
3737
INFILES+= $(DLOBJS:.o=$(EXPSUFF))
3838
endif
3939

40-
# OUTFILES is the files that get created by running the regression test.
41-
OUTFILES= stud_emp.data onek.data regress.out aportal.out
42-
4340
#
4441
# prepare to run the test (including clean-up after the last run)
4542
#
4643
all: $(INFILES)
4744
cd input; gmake all; cd ..
4845
cd output; gmake all; cd ..
49-
rm -f $(OUTFILES)
5046

5147
#
5248
# run the test
5349
#
54-
runtest: $(INFILES) expected.out
50+
runtest: $(INFILES)
5551
$(SHELL) ./regress.sh 2>&1 | tee regress.out
5652
@echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILE regress.out"
5753

58-
# The expected.input file is part of the distribution. It was made by hand
59-
# from 'regress.out' from a reference run of the regression test, replacing
60-
# installation-dependent things with names like _CWD_. The following rule
61-
# turns those names back into real values for the instant installation to
62-
# create a standard (expected.out) against which to compare regress.out
63-
# from the experimental run.
64-
#
65-
#
66-
expected.out: expected.input
67-
if [ -z "$$USER" ]; then USER=$$LOGNAME; fi; \
68-
if [ -z "$$USER" ]; then USER=`whoami`; fi; \
69-
if [ -z "$$USER" ]; then echo 'Cannot deduce $USER.'; exit 1; fi; \
70-
rm -f expected.out; \
71-
MYTZ=`date | cut -c21`; \
72-
C="`pwd`"; \
73-
sed -e "s:_CWD_:$$C:g" \
74-
-e "s:_OBJWD_:$$C:g" \
75-
-e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
76-
-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" \
77-
-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" \
78-
-e "s:_USER_:$$USER:g" < expected.input > expected.out
79-
@echo "YOUR EXPECTED RESULTS ARE NOW IN FILE expected.out."
80-
81-
%.sql: %.source
82-
if [ -z "$$USER" ]; then USER=$$LOGNAME; fi; \
83-
if [ -z "$$USER" ]; then USER=`whoami`; fi; \
84-
if [ -z "$$USER" ]; then echo 'Cannot deduce $$USER.'; exit 1; fi; \
85-
rm -f $@; \
86-
C=`pwd`; \
87-
sed -e "s:_CWD_:$$C:g" \
88-
-e "s:_OBJWD_:$$C:g" \
89-
-e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
90-
-e "s/_USER_/$$USER/g" < $< > $@
91-
9254
clean:
9355
rm -f $(INFILES)
94-
rm -f $(OUTFILES)
95-
56+
$(MAKE) -C sql clean
57+
$(MAKE) -C expected clean

‎src/test/regress/expected/Makefile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#-------------------------------------------------------------------------
2+
#
3+
# Makefile--
4+
# Makefile for regress (the regression test)
5+
#
6+
# Copyright (c) 1994, Regents of the University of California
7+
#
8+
#
9+
# IDENTIFICATION
10+
# $Header: /cvsroot/pgsql/src/test/regress/expected/Attic/Makefile,v 1.1 1997/04/26 05:44:17 scrappy Exp $
11+
#
12+
#-------------------------------------------------------------------------
13+
14+
CLFILES= create_function_1.out create_function_2.out copy.out
15+
16+
clean:
17+
rm -f $(CLFILES)

‎src/test/regress/input/Makefile

Lines changed: 4 additions & 3 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.2 1997/04/06 08:28:33 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/test/regress/input/Attic/Makefile,v 1.3 1997/04/26 05:44:38 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -29,8 +29,9 @@ all: $(INFILES)
2929
if [ -z "$$USER" ]; then USER=`whoami`; fi; \
3030
if [ -z "$$USER" ]; then echo 'Cannot deduce $$USER.'; exit 1; fi; \
3131
rm -f $@; \
32-
C=`pwd`; \
32+
PWD=`pwd`; \
33+
OBJ=`pwd`; \
3334
sed -e "s:_CWD_:$(PWD):g" \
34-
-e "s:_OBJWD_:$(PWD):g" \
35+
-e "s:_OBJWD_:$$OBJ/\.\.:g" \
3536
-e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
3637
-e "s/_USER_/$$USER/g" < $< > ../sql/$@

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

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

11-
COPY tenk1 FROM '_CWD_/data/tenk.data';
11+
COPY tenk1 FROM '_CWD_/../data/tenk.data';
1212

13-
COPY slow_emp4000 FROM '_CWD_/data/rect.data';
13+
COPY slow_emp4000 FROM '_CWD_/../data/rect.data';
1414

15-
COPY person FROM '_CWD_/data/person.data';
15+
COPY person FROM '_CWD_/../data/person.data';
1616

17-
COPY emp FROM '_CWD_/data/emp.data';
17+
COPY emp FROM '_CWD_/../data/emp.data';
1818

19-
COPY student FROM '_CWD_/data/student.data';
19+
COPY student FROM '_CWD_/../data/student.data';
2020

21-
COPY stud_emp FROM '_CWD_/data/stud_emp.data';
21+
COPY stud_emp FROM '_CWD_/../data/stud_emp.data';
2222

23-
COPY road FROM '_CWD_/data/streets.data';
23+
COPY road FROM '_CWD_/../data/streets.data';
2424

25-
COPY real_city FROM '_CWD_/data/real_city.data';
25+
COPY real_city FROM '_CWD_/../data/real_city.data';
2626

27-
COPY hash_i4_heap FROM '_CWD_/data/hash.data';
27+
COPY hash_i4_heap FROM '_CWD_/../data/hash.data';
2828

29-
COPY hash_c16_heap FROM '_CWD_/data/hash.data';
29+
COPY hash_c16_heap FROM '_CWD_/../data/hash.data';
3030

31-
COPY hash_txt_heap FROM '_CWD_/data/hash.data';
31+
COPY hash_txt_heap FROM '_CWD_/../data/hash.data';
3232

33-
COPY hash_f8_heap FROM '_CWD_/data/hash.data';
33+
COPY hash_f8_heap FROM '_CWD_/../data/hash.data';
3434

3535
-- the data in this file has a lot of duplicates in the index key
3636
-- fields, leading to long bucket chains and lots of table expansion.
3737
-- this is therefore a stress test of the bucket overflow code (unlike
3838
-- the data in hash.data, which has unique index keys).
3939
--
40-
-- COPY hash_ovfl_heap FROM '_CWD_/data/hashovfl.data';
40+
-- COPY hash_ovfl_heap FROM '_CWD_/../data/hashovfl.data';
4141

42-
COPY bt_i4_heap FROM '_CWD_/data/desc.data';
42+
COPY bt_i4_heap FROM '_CWD_/../data/desc.data';
4343

44-
COPY bt_c16_heap FROM '_CWD_/data/hash.data';
44+
COPY bt_c16_heap FROM '_CWD_/../data/hash.data';
4545

46-
COPY bt_txt_heap FROM '_CWD_/data/desc.data';
46+
COPY bt_txt_heap FROM '_CWD_/../data/desc.data';
4747

48-
COPY bt_f8_heap FROM '_CWD_/data/hash.data';
48+
COPY bt_f8_heap FROM '_CWD_/../data/hash.data';

‎src/test/regress/output/Makefile

Lines changed: 6 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.2 1997/04/06 08:28:57 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/test/regress/output/Attic/Makefile,v 1.3 1997/04/26 05:45:13 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -27,14 +27,16 @@ all: $(INFILES)
2727
%.out: %.source
2828
if [ -z "$$USER" ]; then USER=$$LOGNAME; fi; \
2929
if [ -z "$$USER" ]; then USER=`whoami`; fi; \
30-
if [ -z "$$USER" ]; then echo 'Cannot deduce $USER.'; exit 1; fi; \
30+
if [ -z "$$USER" ]; then echo 'Cannot deduce $$USER.'; exit 1; fi; \
3131
rm -f expected.out; \
3232
MYTZ=`date | cut -c21`; \
3333
C="`pwd`"; \
34-
sed -e "s:_CWD_:$(PWD):g" \
34+
sed -e "s:_CWD_:$(PWD)/\.\.:g" \
35+
-e "s:\.\./output:\.\./input:g" \
3536
-e "s:_OBJWD_:$(PWD):g" \
3637
-e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
3738
-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" \
3839
-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" \
39-
-e "s:_USER_:$$USER:g" < $< > ../expected/$@
40+
-e "s:_USER_:$$USER:g" < $< | \
41+
sed -e "s:/output/\.\./:/input/\.\./:g"> ../expected/$@
4042
@echo "YOUR EXPECTED RESULTS ARE NOW IN FILE expected.out."

‎src/test/regress/output/create_function.source

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)