diff options
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/regress/Makefile | 8 | ||||
| -rw-r--r-- | src/test/regress/create.source | 16 | ||||
| -rw-r--r-- | src/test/regress/expected.input | 16 |
3 files changed, 20 insertions, 20 deletions
diff --git a/src/test/regress/Makefile b/src/test/regress/Makefile index 8e602ba0d7a..854784fcc06 100644 --- a/src/test/regress/Makefile +++ b/src/test/regress/Makefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.9 1996/11/13 10:36:17 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.10 1996/11/18 06:07:29 momjian Exp $ # #------------------------------------------------------------------------- @@ -22,7 +22,7 @@ LDADD+= -L$(LIBPQDIR) -lpq # DLOBJS is the dynamically-loaded object file. The regression test uses # this when it does a CREATE FUNCTION ... LANGUAGE 'C'). # -DLOBJS= regress$(SLSUFF) +DLOBJS= regress$(DLSUFFIX) # # ... plus test query inputs @@ -69,7 +69,7 @@ expected.out: expected.input C="`pwd`"; \ sed -e "s:_CWD_:$$C:g" \ -e "s:_OBJWD_:$$C:g" \ - -e "s:_SLSUFF_:$(SLSUFF):g" \ + -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \ -e "s/_USER_/$$USER/g" < expected.input > expected.out @echo "YOUR EXPECTED RESULTS ARE NOW IN FILE expected.out." @@ -81,7 +81,7 @@ expected.out: expected.input C=`pwd`; \ sed -e "s:_CWD_:$$C:g" \ -e "s:_OBJWD_:$$C:g" \ - -e "s:_SLSUFF_:$(SLSUFF):g" \ + -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \ -e "s/_USER_/$$USER/g" < $< > $@ clean: diff --git a/src/test/regress/create.source b/src/test/regress/create.source index 050c9a86a62..d18730aeaa0 100644 --- a/src/test/regress/create.source +++ b/src/test/regress/create.source @@ -9,12 +9,12 @@ CREATE FUNCTION circle_in(opaque) RETURNS circle - AS '_OBJWD_/regress_SLSUFF_' + AS '_OBJWD_/regress_DLSUFFIX_' LANGUAGE 'c'; CREATE FUNCTION circle_out(opaque) RETURNS opaque - AS '_OBJWD_/regress_SLSUFF_' + AS '_OBJWD_/regress_DLSUFFIX_' LANGUAGE 'c'; CREATE TYPE circle ( @@ -288,33 +288,33 @@ CREATE FUNCTION user_relns() CREATE FUNCTION pt_in_circle(point, circle) RETURNS int4 - AS '_OBJWD_/regress_SLSUFF_' + AS '_OBJWD_/regress_DLSUFFIX_' LANGUAGE 'c'; CREATE FUNCTION overpaid(emp) RETURNS bool - AS '_OBJWD_/regress_SLSUFF_' + AS '_OBJWD_/regress_DLSUFFIX_' LANGUAGE 'c'; CREATE FUNCTION boxarea(box) RETURNS int4 - AS '_OBJWD_/regress_SLSUFF_' + AS '_OBJWD_/regress_DLSUFFIX_' LANGUAGE 'c'; CREATE FUNCTION interpt_pp(path, path) RETURNS point - AS '_OBJWD_/regress_SLSUFF_' + AS '_OBJWD_/regress_DLSUFFIX_' LANGUAGE 'c'; CREATE FUNCTION reverse_c16(char16) RETURNS char16 - AS '_OBJWD_/regress_SLSUFF_' + AS '_OBJWD_/regress_DLSUFFIX_' LANGUAGE 'c'; -- -- FUNCTION DYNAMIC LOADING -- -LOAD '_OBJWD_/regress_SLSUFF_' +LOAD '_OBJWD_/regress_DLSUFFIX_' -- -- CLASS POPULATION diff --git a/src/test/regress/expected.input b/src/test/regress/expected.input index 6e4f4b55f36..dfc3d87982a 100644 --- a/src/test/regress/expected.input +++ b/src/test/regress/expected.input @@ -4,12 +4,12 @@ destroydb: database destroy failed on regression. =============== creating new regression database... ================= QUERY: CREATE FUNCTION circle_in(opaque) RETURNS circle - AS '_CWD_/obj/regress_SLSUFF_' + AS '_CWD_/obj/regress_DLSUFFIX_' LANGUAGE 'c'; NOTICE:ProcedureCreate: type 'circle' is not yet defined QUERY: CREATE FUNCTION circle_out(opaque) RETURNS opaque - AS '_CWD_/obj/regress_SLSUFF_' + AS '_CWD_/obj/regress_DLSUFFIX_' LANGUAGE 'c'; QUERY: CREATE TYPE circle ( internallength = 24, @@ -211,25 +211,25 @@ QUERY: CREATE FUNCTION user_relns() LANGUAGE 'sql'; QUERY: CREATE FUNCTION pt_in_circle(point, circle) RETURNS int4 - AS '_CWD_/obj/regress_SLSUFF_' + AS '_CWD_/obj/regress_DLSUFFIX_' LANGUAGE 'c'; QUERY: CREATE FUNCTION overpaid(emp) RETURNS bool - AS '_CWD_/obj/regress_SLSUFF_' + AS '_CWD_/obj/regress_DLSUFFIX_' LANGUAGE 'c'; QUERY: CREATE FUNCTION boxarea(box) RETURNS int4 - AS '_CWD_/obj/regress_SLSUFF_' + AS '_CWD_/obj/regress_DLSUFFIX_' LANGUAGE 'c'; QUERY: CREATE FUNCTION interpt_pp(path, path) RETURNS point - AS '_CWD_/obj/regress_SLSUFF_' + AS '_CWD_/obj/regress_DLSUFFIX_' LANGUAGE 'c'; QUERY: CREATE FUNCTION reverse_c16(char16) RETURNS char16 - AS '_CWD_/obj/regress_SLSUFF_' + AS '_CWD_/obj/regress_DLSUFFIX_' LANGUAGE 'c'; -QUERY: LOAD '_CWD_/obj/regress_SLSUFF_' +QUERY: LOAD '_CWD_/obj/regress_DLSUFFIX_' COPY onek FROM '_CWD_/data/onek.data'; QUERY: COPY tenk1 FROM '_CWD_/data/tenk.data'; QUERY: INSERT INTO tenk2 VALUES (tenk1.*); |