Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitab57e09

Browse files
committed
Fixes:
Also, I think that an extra source of noise in the diff of regress.out andexpected.out is caused by not substituting the shared library fileextension in the regression.input file (much like the paths and theusernames are sub'ed). This seems to be fixed with the following patchesto regression.input and the Makefile... If I'm off base here, please tell!Submitted by: Wayde Nie <niew@phoenix.cis.mcmaster.ca>
1 parentbb0bdfd commitab57e09

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

‎src/test/regress/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/Makefile,v 1.5 1996/07/26 20:15:40 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.6 1996/08/06 16:51:17 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -58,8 +58,9 @@ expected.out: expected.input
5858
rm -f$(objdir)/expected.out;\
5959
C="`pwd`";\
6060
sed -e"s:_CWD_:$$C:g"\
61-
-e"s:_OBJWD_:$$C/$(objdir):g"\
62-
-e"s/_USER_/$$USER/g"< expected.input>$(objdir)/expected.out
61+
-e"s:_OBJWD_:$$C/$(objdir):g"\
62+
-e"s:_SLSUFF_:$(SLSUFF):g"\
63+
-e"s/_USER_/$$USER/g"< expected.input>$(objdir)/expected.out
6364

6465
#
6566
# prepare to run the test (including clean-up after the last run)

‎src/test/regress/expected.input

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ destroydb: database destroy failed on regression.
44
=============== creating new regression database... =================
55
QUERY: CREATE FUNCTION circle_in(opaque)
66
RETURNS circle
7-
AS '_CWD_/obj/regress.so'
7+
AS '_CWD_/obj/regress_SLSUFF_'
88
LANGUAGE 'c';
99
NOTICE:ProcedureCreate: type 'circle' is not yet defined
1010
QUERY: CREATE FUNCTION circle_out(opaque)
1111
RETURNS opaque
12-
AS '_CWD_/obj/regress.so'
12+
AS '_CWD_/obj/regress_SLSUFF_'
1313
LANGUAGE 'c';
1414
QUERY: CREATE TYPE circle (
1515
internallength = 24,
@@ -211,25 +211,25 @@ QUERY: CREATE FUNCTION user_relns()
211211
LANGUAGE 'sql';
212212
QUERY: CREATE FUNCTION pt_in_circle(point, circle)
213213
RETURNS int4
214-
AS '_CWD_/obj/regress.so'
214+
AS '_CWD_/obj/regress_SLSUFF_'
215215
LANGUAGE 'c';
216216
QUERY: CREATE FUNCTION overpaid(emp)
217217
RETURNS bool
218-
AS '_CWD_/obj/regress.so'
218+
AS '_CWD_/obj/regress_SLSUFF_'
219219
LANGUAGE 'c';
220220
QUERY: CREATE FUNCTION boxarea(box)
221221
RETURNS int4
222-
AS '_CWD_/obj/regress.so'
222+
AS '_CWD_/obj/regress_SLSUFF_'
223223
LANGUAGE 'c';
224224
QUERY: CREATE FUNCTION interpt_pp(path, path)
225225
RETURNS point
226-
AS '_CWD_/obj/regress.so'
226+
AS '_CWD_/obj/regress_SLSUFF_'
227227
LANGUAGE 'c';
228228
QUERY: CREATE FUNCTION reverse_c16(char16)
229229
RETURNS char16
230-
AS '_CWD_/obj/regress.so'
230+
AS '_CWD_/obj/regress_SLSUFF_'
231231
LANGUAGE 'c';
232-
QUERY: LOAD '_CWD_/obj/regress.so'
232+
QUERY: LOAD '_CWD_/obj/regress_SLSUFF_'
233233
COPY onek FROM '_CWD_/data/onek.data';
234234
QUERY: COPY tenk1 FROM '_CWD_/data/tenk.data';
235235
QUERY: INSERT INTO tenk2 VALUES (tenk1.*);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp