head	1.15;
access;
symbols
	REL9_0_0:1.15
	REL9_1_ALPHA1:1.15
	REL9_0_RC1:1.15
	REL9_0_BETA4:1.15
	REL9_0_STABLE:1.15.0.16
	REL9_0_BETA3:1.15
	REL9_0_BETA2:1.15
	REL7_4_29:1.13
	REL8_0_25:1.13
	REL8_1_21:1.13
	REL8_2_17:1.14
	REL8_3_11:1.15
	REL8_4_4:1.15
	REL9_0_BETA1:1.15
	REL9_0_ALPHA5_BRANCH:1.15.0.14
	REL9_0_ALPHA5:1.15
	REL7_4_28:1.13
	REL8_0_24:1.13
	REL8_1_20:1.13
	REL8_2_16:1.14
	REL8_3_10:1.15
	REL8_4_3:1.15
	REL9_0_ALPHA4:1.15
	REL9_0_ALPHA4_BRANCH:1.15.0.12
	REL8_5_ALPHA3:1.15
	REL8_5_ALPHA3_BRANCH:1.15.0.10
	REL7_4_27:1.13
	REL8_0_23:1.13
	REL8_1_19:1.13
	REL8_2_15:1.14
	REL8_3_9:1.15
	REL8_4_2:1.15
	REL8_5_ALPHA2:1.15
	REL8_5_ALPHA2_BRANCH:1.15.0.8
	REL7_4_26:1.13
	REL8_0_22:1.13
	REL8_1_18:1.13
	REL8_2_14:1.14
	REL8_3_8:1.15
	REL8_4_1:1.15
	REL8_5_ALPHA1:1.15
	REL8_5_ALPHA1_BRANCH:1.15.0.6
	REL8_4_STABLE:1.15.0.4
	REL8_4_0:1.15
	REL8_4_RC2:1.15
	REL8_4_RC1:1.15
	REL8_4_BETA2:1.15
	REL8_4_BETA1:1.15
	REL7_4_25:1.13
	REL8_0_21:1.13
	REL8_1_17:1.13
	REL8_2_13:1.14
	REL8_3_7:1.15
	REL7_4_24:1.13
	REL8_0_20:1.13
	REL8_1_16:1.13
	REL8_2_12:1.14
	REL8_3_6:1.15
	REL7_4_23:1.13
	REL8_0_19:1.13
	REL8_1_15:1.13
	REL8_2_11:1.14
	REL8_3_5:1.15
	REL7_4_22:1.13
	REL8_0_18:1.13
	REL8_1_14:1.13
	REL8_2_10:1.14
	REL8_3_4:1.15
	REL7_4_21:1.13
	REL8_0_17:1.13
	REL8_1_13:1.13
	REL8_2_9:1.14
	REL8_3_3:1.15
	REL7_4_20:1.13
	REL8_0_16:1.13
	REL8_1_12:1.13
	REL8_2_8:1.14
	REL8_3_2:1.15
	REL8_2_7:1.14
	REL8_3_1:1.15
	REL8_3_STABLE:1.15.0.2
	REL8_3_0:1.15
	REL8_3_RC2:1.15
	REL7_3_21:1.13
	REL7_4_19:1.13
	REL8_0_15:1.13
	REL8_1_11:1.13
	REL8_2_6:1.14
	REL8_3_RC1:1.15
	REL8_3_BETA4:1.15
	REL8_3_BETA3:1.15
	REL8_3_BETA2:1.15
	REL8_3_BETA1:1.15
	REL7_3_20:1.13
	REL7_4_18:1.13
	REL8_0_14:1.13
	REL8_1_10:1.13
	REL8_2_5:1.14
	REL7_3_19:1.13
	REL7_4_17:1.13
	REL8_0_13:1.13
	REL8_1_9:1.13
	REL8_2_4:1.14
	REL8_0_12:1.13
	REL8_1_8:1.13
	REL8_2_3:1.14
	REL7_3_18:1.13
	REL7_4_16:1.13
	REL8_0_11:1.13
	REL8_1_7:1.13
	REL8_2_2:1.14
	REL8_0_10:1.13
	REL8_1_6:1.13
	REL8_2_1:1.14
	REL7_4_15:1.13
	REL7_3_17:1.13
	REL8_2_STABLE:1.14.0.2
	REL8_2_0:1.14
	REL8_2_RC1:1.14
	REL8_2_BETA3:1.14
	REL8_2_BETA2:1.14
	REL8_1_5:1.13
	REL8_0_9:1.13
	REL7_4_14:1.13
	REL7_3_16:1.13
	REL8_2_BETA1:1.14
	REL7_3_15:1.13
	REL7_4_13:1.13
	REL8_0_8:1.13
	REL8_1_4:1.13
	REL7_3_14:1.13
	REL7_4_12:1.13
	REL8_0_7:1.13
	REL8_1_3:1.13
	REL7_3_13:1.13
	REL7_4_11:1.13
	REL8_0_6:1.13
	REL8_1_2:1.13
	REL7_3_12:1.13
	REL7_4_10:1.13
	REL8_0_5:1.13
	REL8_1_1:1.13
	REL8_1_STABLE:1.13.0.22
	REL8_1_0:1.13
	REL8_1_0RC1:1.13
	REL8_1_0BETA4:1.13
	REL8_1_0BETA3:1.13
	REL7_3_11:1.13
	REL7_4_9:1.13
	REL8_0_4:1.13
	REL8_1_0BETA2:1.13
	REL8_1_0BETA1:1.13
	REL7_2_8:1.13
	REL7_3_10:1.13
	REL7_4_8:1.13
	REL8_0_3:1.13
	REL8_0_2:1.13
	REL7_2_7:1.13
	REL7_3_9:1.13
	REL7_4_7:1.13
	REL8_0_1:1.13
	REL8_0_STABLE:1.13.0.20
	REL8_0_0:1.13.0.18
	REL8_0_0RC5:1.13
	REL8_0_0RC4:1.13
	REL8_0_0RC3:1.13
	REL8_0_0RC2:1.13
	REL8_0_0RC1:1.13
	REL8_0_0BETA5:1.13
	REL8_0_0BETA4:1.13
	REL7_4_6:1.13
	REL7_3_8:1.13
	REL7_2_6:1.13
	REL8_0_0BETA3:1.13
	REL8_0_0BETA2:1.13
	REL7_2_5:1.13
	REL7_4_5:1.13
	REL7_3_7:1.13
	REL7_4_4:1.13
	REL8_0_0BETA1:1.13
	REL7_4_3:1.13
	REL7_4_2:1.13
	REL7_3_6:1.13
	REL7_4_1:1.13
	REL7_3_5:1.13
	REL7_4:1.13
	REL7_4_RC2:1.13
	REL7_4_STABLE:1.13.0.16
	REL7_4_RC1:1.13
	REL7_4_BETA5:1.13
	REL7_4_BETA4:1.13
	REL7_4_BETA3:1.13
	REL7_4_BETA2:1.13
	WIN32_DEV:1.13.0.14
	REL7_4_BETA1:1.13
	REL7_3_4:1.13
	REL7_3_2:1.13
	REL7_2_4:1.13
	REL7_3_STABLE:1.13.0.12
	REL7_2_3:1.13
	REL7_2_STABLE:1.13.0.10
	REL7_2:1.13
	REL7_2_RC2:1.13
	REL7_2_RC1:1.13
	REL7_2_BETA5:1.13
	REL7_2_BETA4:1.13
	REL7_2_BETA3:1.13
	REL7_2_BETA2:1.13
	REL7_2_BETA1:1.13
	REL7_1_2:1.13
	REL7_1_STABLE:1.13.0.8
	REL7_1_BETA:1.13
	REL7_1_BETA3:1.13
	REL7_1_BETA2:1.13
	REL7_1:1.13
	REL7_0_PATCHES:1.13.0.6
	REL7_0:1.13
	REL6_5_PATCHES:1.13.0.4
	REL6_5:1.13
	REL6_4:1.13.0.2
	release-6-3:1.13
	REL2_0B:1.11.0.2
	REL2_0:1.11
	Release_2_0_0:1.6
	Release_1_0_3:1.5.0.2
	Release_2_0:1.6
	Release_1_0_2:1.5
	PG95-1_01:1.1.1.1
	PG95_DIST:1.1.1;
locks; strict;
comment	@# @;


1.15
date	2007.01.20.17.16.17;	author petere;	state Exp;
branches;
next	1.14;

1.14
date	2006.07.19.02.37.00;	author tgl;	state Exp;
branches;
next	1.13;

1.13
date	97.01.18.08.01.32;	author bryanh;	state Exp;
branches;
next	1.12;

1.12
date	97.01.05.21.17.36;	author bryanh;	state Exp;
branches;
next	1.11;

1.11
date	96.12.02.06.31.08;	author momjian;	state Exp;
branches;
next	1.10;

1.10
date	96.11.18.06.07.29;	author momjian;	state Exp;
branches;
next	1.9;

1.9
date	96.11.13.10.36.17;	author bryanh;	state Exp;
branches;
next	1.8;

1.8
date	96.11.12.11.43.05;	author bryanh;	state Exp;
branches;
next	1.7;

1.7
date	96.11.12.11.16.44;	author scrappy;	state Exp;
branches;
next	1.6;

1.6
date	96.08.06.16.51.17;	author scrappy;	state Exp;
branches;
next	1.5;

1.5
date	96.07.26.20.15.40;	author scrappy;	state Exp;
branches;
next	1.4;

1.4
date	96.07.26.19.58.04;	author scrappy;	state Exp;
branches;
next	1.3;

1.3
date	96.07.25.19.56.58;	author scrappy;	state Exp;
branches;
next	1.2;

1.2
date	96.07.23.03.19.34;	author scrappy;	state Exp;
branches;
next	1.1;

1.1
date	96.07.09.06.22.24;	author scrappy;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	96.07.09.06.22.24;	author scrappy;	state Exp;
branches;
next	;


desc
@@


1.15
log
@Remove remains of old depend target.
@
text
@# The Postgres make files exploit features of GNU make that other makes
# do not have.  Because it is a common mistake for users to try to build
# Postgres with a different make, we have this make file that does nothing
# but tell the user to use GNU make.

# If the user were using GNU make now, this file would not get used because
# GNU make uses a make file named "GNUmakefile" in preference to "Makefile"
# if it exists.  Postgres is shipped with a "GNUmakefile".

all install clean check installcheck:
	@@echo "You must use GNU make to use Postgres.  It may be installed"
	@@echo "on your system with the name 'gmake'."
@


1.14
log
@Rewrite pg_regress as a C program instead of a shell script.
This allows it to be used on Windows without installing mingw
(though you do still need 'diff'), and opens the door to future
improvements such as message localization.
Magnus Hagander and Tom Lane.
@
text
@d10 1
a10 1
all install clean dep depend check installcheck:
@


1.13
log
@Rename Makefile to GNUMakefile and add a "use GNU Make" Makefile so people
don't accidentally use non-GNU make.
@
text
@d10 1
a10 1
all install clean dep depend:
@


1.12
log
@Standardize all LDADD to LD_ADD.
@
text
@d1 12
a12 92
#-------------------------------------------------------------------------
#
# Makefile--
#    Makefile for regress (the regression test)
#
# Copyright (c) 1994, Regents of the University of California
#
#
# IDENTIFICATION
#    $Header: /usr/local/cvsroot/postgres95/src/test/regress/Makefile,v 1.11 1996/12/02 06:31:08 momjian Exp $
#
#-------------------------------------------------------------------------

SRCDIR= ../..
include ../../Makefile.global

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

#
# DLOBJS is the dynamically-loaded object file.  The regression test uses 
# this when it does a CREATE FUNCTION ... LANGUAGE 'C').
#
DLOBJS= regress$(DLSUFFIX)

#
# ... plus test query inputs
#
# INFILES is the files the regression test uses for input.
INFILES= $(DLOBJS) \
         create.sql queries.sql errors.sql destroy.sql security.sql \
         expected.out
#
# plus exports files
#
ifdef EXPSUFF
INFILES+= $(DLOBJS:.o=$(EXPSUFF))
endif

# OUTFILES is the files that get created by running the regression test.
OUTFILES= stud_emp.data onek.data regress.out aportal.out

#
# prepare to run the test (including clean-up after the last run)
#
all: $(INFILES)
	rm -f $(OUTFILES)

#
# run the test
#
runtest: $(INFILES) expected.out 
	$(SHELL) ./regress.sh 2>&1 | tee regress.out
	@@echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILE regress.out"

# The expected.input file is part of the distribution.  It was made by hand
# from 'regress.out' from a reference run of the regression test, replacing
# installation-dependent things with names like _CWD_.  The following rule
# turns those names back into real values for the instant installation to
# create a standard (expected.out) against which to compare regress.out 
# from the experimental run.
#
#
expected.out: expected.input
	if [ -z "$$USER" ]; then USER=$$LOGNAME; fi; \
	if [ -z "$$USER" ]; then USER=`whoami`; fi; \
	if [ -z "$$USER" ]; then echo 'Cannot deduce $USER.'; exit 1; fi; \
	rm -f expected.out; \
	MYTZ=`date | cut -c21`; \
	C="`pwd`"; \
	sed -e "s:_CWD_:$$C:g" \
	    -e "s:_OBJWD_:$$C:g" \
            -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
	    -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" \
	    -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" \
	    -e "s:_USER_:$$USER:g" < expected.input > expected.out
	@@echo "YOUR EXPECTED RESULTS ARE NOW IN FILE expected.out."

%.sql: %.source
	if [ -z "$$USER" ]; then USER=$$LOGNAME; fi; \
	if [ -z "$$USER" ]; then USER=`whoami`; fi; \
	if [ -z "$$USER" ]; then echo 'Cannot deduce $$USER.'; exit 1; fi; \
	rm -f $@@; \
	C=`pwd`; \
	sed -e "s:_CWD_:$$C:g" \
	    -e "s:_OBJWD_:$$C:g" \
	    -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
	    -e "s/_USER_/$$USER/g" < $< > $@@

clean:
	rm -f $(INFILES)
	rm -f $(OUTFILES)

@


1.11
log
@Reduce regression diff size with timezone changes and cleanup.
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/postgres95/src/test/regress/Makefile,v 1.10 1996/11/18 06:07:29 momjian Exp $
a18 2
LDADD+= -L$(LIBPQDIR) -lpq
        
@


1.10
log
@Rename SLSUFF to DLSUFFIX
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/postgres95/src/test/regress/Makefile,v 1.9 1996/11/13 10:36:17 bryanh Exp $
d63 2
a64 1

d70 1
d75 3
a77 1
	    -e "s/_USER_/$$USER/g" < expected.input > expected.out
@


1.9
log
@Eliminate MKDIR, srcdir, objdir.  Centralize setting of LIBPQDIR.
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/postgres95/src/test/regress/Makefile,v 1.6 1996/08/06 16:51:17 scrappy Exp $
d25 1
a25 1
DLOBJS= regress$(SLSUFF)
d72 1
a72 1
            -e "s:_SLSUFF_:$(SLSUFF):g" \
d84 1
a84 1
	    -e "s:_SLSUFF_:$(SLSUFF):g" \
@


1.8
log
@End of the make file simplifications.
@
text
@a14 1
LIBPQDIR= $(SRCDIR)/libpq
@


1.7
log
@Fix for finding the include files
@
text
@d14 3
a16 3
MKDIR=	../../mk
include $(MKDIR)/postgres.mk
include $(MKDIR)/postgres.user.mk
d18 1
a18 1
CFLAGS+=-I../../include
d20 2
d23 2
a24 9
# try locating libpq.a in the following places
#
LIBPQ:=  -L$(srcdir)/libpq/$(objdir) -L$(LIBDIR) -lpq

LDADD+= $(LIBPQ)


#
# build dynamically-loaded object files
d31 10
a40 3
CREATEFILES= $(DLOBJS:%=$(objdir)/%) \
	create.sql queries.sql errors.sql destroy.sql security.sql expected.out

d42 1
d45 5
a49 5
CLEANFILES+= $(notdir $(CREATEFILES)) $(OUTFILES)

$(OUTFILES): $(CREATEFILES)
	$(SHELL) ./regress.sh 2>&1 | tee $(objdir)/regress.out
	@@echo "RESULTS OF REGRESSION ARE SAVED IN $(objdir)/regress.out"
d52 1
a52 4
# expected results file -- expand macros for user and location
#
# the expected.input file is make by hand from 'regress.out' when the
# regression test has been updated and a successful output obtained
d54 11
d69 1
a69 1
	rm -f $(objdir)/expected.out; \
d72 1
a72 1
	    -e "s:_OBJWD_:$$C/$(objdir):g" \
d74 2
a75 1
	    -e "s/_USER_/$$USER/g" < expected.input > $(objdir)/expected.out
d77 14
a90 15
#
# prepare to run the test (including clean-up after the last run)
#
all:: $(CREATEFILES)
	cd $(objdir); rm -f $(OUTFILES)

#
# run the test
#
runtest: expected.out regress.out

#
# installation
#
install: localobj all
@


1.6
log
@Fixes:

Also, I think that an extra source of noise in the diff of regress.out and
expected.out is caused by not substituting the shared library file
extension in the regression.input file (much like the paths and the
usernames are sub'ed). This seems to be fixed with the following patches
to regression.input and the Makefile... If I'm off base here, please tell!

Submitted by:  Wayde Nie <niew@@phoenix.cis.mcmaster.ca>
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/postgres95/src/test/regress/Makefile,v 1.5 1996/07/26 20:15:40 scrappy Exp $
d18 1
a18 1
CFLAGS+=-I$(HEADERDIR)
@


1.5
log
@should always take mail headers out of Makefile files befor ecommitting :)
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/postgres95/src/test/regress/Makefile,v 1.4 1996/07/26 19:58:04 scrappy Exp $
d61 3
a63 2
	   -e "s:_OBJWD_:$$C/$(objdir):g" \
	   -e "s/_USER_/$$USER/g" < expected.input > $(objdir)/expected.out
@


1.4
log
@regression Makefile, rev 2

Submitted by: Dr. George
@
text
@a0 13
From scrappy@@ki.net Fri Jul 26 05:15:00 1996
Status: RO
X-Status: 
Received: from daemun.ilt.com ([204.247.102.21]) by ki.net (8.7.5/8.7.5) with ESMTP id FAA02010 for <scrappy@@ki.net>; Fri, 26 Jul 1996 05:14:58 -0400 (EDT)
Received: from darvish. ([199.26.203.37]) by daemun.ilt.com (8.7.5/8.7.3) with SMTP id CAA14746 for <scrappy@@ki.net>; Fri, 26 Jul 1996 02:13:20 -0700 (PDT)
Received: by darvish. (5.x/SMI-SVR4)
	id AA07735; Thu, 25 Jul 1996 02:47:22 -0700
Date: Thu, 25 Jul 1996 02:47:22 -0700
From: postgres@@darvish (POSTGRES)
Message-Id: <9607250947.AA07735@@darvish.>
To: scrappy@@ki.net
Subject: /user/postgres95/src/test/regress/Makefile == revision 2

d10 1
a10 1
#    $Header: /usr/local/cvsroot/postgres95/src/test/regress/Makefile,v 1.2 1996/07/23 03:19:34 scrappy Exp $
@


1.3
log
@improvements to regression testing

submitted by: dr. george
@
text
@d1 1
a1 1
From scrappy@@ki.net Thu Jul 25 05:51:19 1996
d4 7
a10 7
Received: from daemun.ilt.com ([204.247.102.21]) by ki.net (8.7.5/8.7.5) with ESMTP id FAA12531 for <scrappy@@ki.net>; Thu, 25 Jul 1996 05:51:16 -0400 (EDT)
From: postgres@@madmax.ilt.com
Received: from madmax.ilt.com (madmax [199.26.203.43]) by daemun.ilt.com (8.7.5/8.7.3) with SMTP id CAA09205 for <scrappy@@ki.net>; Thu, 25 Jul 1996 02:50:12 -0700 (PDT)
Received: by madmax.ilt.com (SMI-8.6/ILT-SVR4-1.1)
	id CAA00419; Thu, 25 Jul 1996 02:45:47 -0700
Date: Thu, 25 Jul 1996 02:45:47 -0700
Message-Id: <199607250945.CAA00419@@madmax.ilt.com>
d12 1
a12 1
Subject: /user/postgres95/src/test/regress/Makefile == revised
@


1.2
log
@modifications to regressoin tests
@
text
@d1 13
d23 1
a23 1
#    $Header: /usr/local/cvsroot/postgres95/src/test/regress/Makefile,v 1.1.1.1 1996/07/09 06:22:24 scrappy Exp $
d62 4
a65 1
# expected results file
d67 1
a67 1
expected.out: expected.in
d75 1
a75 1
	   -e "s/_USER_/$$USER/g" < expected.in > $(objdir)/expected.out
a77 13
# make a new expected results file from the current 'results.out'
# rename 'expected.new' to 'expected.in' by hand to avoid circular makes
#
expected.new: regress.out
	if [ -z "$$USER" ]; then USER=$$LOGNAME; fi; \
	if [ -z "$$USER" ]; then USER=`whoami`; fi; \
	if [ -z "$$USER" ]; then echo 'Cannot deduce $USER.'; exit 1; fi; \
	C="`pwd`"; \
	sed -e "s:$$C:_CWD_:g" \
	   -e "s:$$C/$(objdir):_OBJWD_:g" \
	   -e "s/$$USER/_USER_/g" < $(objdir)/regress.out > expected.new
 
#
d92 1
@


1.1
log
@Initial revision
@
text
@d10 1
a10 1
#    $Header: /usr/local/cvsroot/postgres95/postgres95/src/test/regress/Makefile,v 1.1.1.1 1996/07/09 05:32:45 scrappy Exp $
d37 1
a37 1
	create.sql queries.sql errors.sql destroy.sql security.sql
d49 26
d83 1
a83 1
runtest: regress.out
@


1.1.1.1
log
@Postgres95 1.01 Distribution - Virgin Sources
@
text
@@
