diff options
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/regress/GNUmakefile | 24 | ||||
| -rwxr-xr-x | src/test/regress/regress.sh | 21 |
2 files changed, 38 insertions, 7 deletions
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index e23eecdae7..7c23558139 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.16 1998/07/26 04:31:41 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.17 1999/01/17 06:19:57 momjian Exp $ # #------------------------------------------------------------------------- @@ -43,19 +43,37 @@ endif all: $(INFILES) cd input; $(MAKE) all; cd .. cd output; $(MAKE) all; cd .. +#ifneq ($(PORTNAME), win) $(MAKE) -C ../../../contrib/spi REFINT_VERBOSE=1 refint$(DLSUFFIX) \ autoinc$(DLSUFFIX) +#else +# cat /dev/null > ../../../contrib/spi/refint$(DLSUFFIX) +# cat /dev/null > ../../../contrib/spi/autoinc$(DLSUFFIX) +#endif + +#ifeq ($(PORTNAME), win) +#regress.dll: regress.c +# cat /dev/null > $@ +#endif # # run the test # runtest: $(INFILES) +ifneq ($(PORTNAME), win) + MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \ + $(SHELL) ./regress.sh $(PORTNAME) 2>&1 | tee regress.out +else MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \ - $(SHELL) ./regress.sh 2>&1 | tee regress.out + ./regress.sh $(PORTNAME) 2>&1 | tee regress.out +endif @echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILE regress.out" clean: - rm -f $(INFILES) regress.out + rm -f $(INFILES) regress.out regress.o regression.diffs +ifeq ($(PORTNAME), win) + rm -f regress.def +endif $(MAKE) -C sql clean $(MAKE) -C expected clean $(MAKE) -C results clean diff --git a/src/test/regress/regress.sh b/src/test/regress/regress.sh index 8e74b0402c..f64de5a858 100755 --- a/src/test/regress/regress.sh +++ b/src/test/regress/regress.sh @@ -1,6 +1,19 @@ #!/bin/sh -# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.21 1998/08/28 14:17:57 momjian Exp $ +# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.22 1999/01/17 06:19:58 momjian Exp $ # +if [ $# -eq 0 ]; +then + echo "Syntaxe: $0 <portname>" + exit 1 +fi + +if [ $1 == "win" ]; +then + HOST="-h localhost" +else + HOST="" +fi + if echo '\c' | grep -s c >/dev/null 2>&1 then ECHO_N="echo -n" @@ -18,7 +31,7 @@ PGTZ="PST8PDT"; export PGTZ PGDATESTYLE="Postgres,US"; export PGDATESTYLE #FRONTEND=monitor -FRONTEND="psql -n -e -q" +FRONTEND="psql $HOST -n -e -q" SYSTEM=`uname -s` @@ -31,10 +44,10 @@ echo "See regress/README for more information." echo "" echo "=============== destroying old regression database... =================" -destroydb regression +destroydb $HOST regression echo "=============== creating new regression database... =================" -createdb regression +createdb $HOST regression if [ $? -ne 0 ]; then echo createdb failed exit 1 |