diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2008-03-18 16:24:50 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2008-03-18 16:24:50 +0000 |
| commit | 8c87cc370f427515b4aa9b03e64a8878de4b6a22 (patch) | |
| tree | 1e9278f101716ad5b081752ebab8d09cb24db3b1 /src/test | |
| parent | 184c42d20d980cd441139a164259f67a9c088264 (diff) | |
| download | postgresql-8c87cc370f427515b4aa9b03e64a8878de4b6a22.tar.gz | |
Catch all errors in for and while loops in makefiles. Don't ignore any
errors in any commands, including in various clean targets that have so far
been handled inconsistently. make -i is available to ignore all errors in
a consistent and official way.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/bench/Makefile | 8 | ||||
| -rw-r--r-- | src/test/locale/Makefile | 4 | ||||
| -rw-r--r-- | src/test/locale/de_DE.ISO8859-1/Makefile | 7 | ||||
| -rw-r--r-- | src/test/locale/gr_GR.ISO8859-7/Makefile | 7 | ||||
| -rw-r--r-- | src/test/locale/koi8-r/Makefile | 7 | ||||
| -rw-r--r-- | src/test/locale/koi8-to-win1251/Makefile | 7 | ||||
| -rw-r--r-- | src/test/regress/GNUmakefile | 4 |
7 files changed, 12 insertions, 32 deletions
diff --git a/src/test/bench/Makefile b/src/test/bench/Makefile index c528fc015c..4b0d713cb8 100644 --- a/src/test/bench/Makefile +++ b/src/test/bench/Makefile @@ -8,7 +8,7 @@ # # # IDENTIFICATION -# $PostgreSQL: pgsql/src/test/bench/Makefile,v 1.15 2008/01/01 19:46:00 momjian Exp $ +# $PostgreSQL: pgsql/src/test/bench/Makefile,v 1.16 2008/03/18 16:24:50 petere Exp $ # #------------------------------------------------------------------------- @@ -31,9 +31,9 @@ create.sql: create.source bench.sql: x=1; \ for i in `ls query[0-9][0-9]`; do \ - echo "select $$x as x" >> bench.sql; \ - cat $$i >> bench.sql; \ - x=`expr $$x + 1`; \ + echo "select $$x as x" >> bench.sql && \ + cat $$i >> bench.sql && \ + x=`expr $$x + 1` || exit; \ done runtest: $(OUTFILES) diff --git a/src/test/locale/Makefile b/src/test/locale/Makefile index d34eedfce1..295f049ce8 100644 --- a/src/test/locale/Makefile +++ b/src/test/locale/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/test/locale/Makefile,v 1.9 2003/11/29 19:52:14 pgsql Exp $ +# $PostgreSQL: pgsql/src/test/locale/Makefile,v 1.10 2008/03/18 16:24:50 petere Exp $ subdir = src/test/locale top_builddir = ../../.. @@ -13,7 +13,7 @@ all: $(PROGS) clean: rm -f $(PROGS) for d in $(DIRS); do \ - $(MAKE) -C $$d clean; \ + $(MAKE) -C $$d clean || exit; \ done check-%: all diff --git a/src/test/locale/de_DE.ISO8859-1/Makefile b/src/test/locale/de_DE.ISO8859-1/Makefile index 281014521e..fd8301928e 100644 --- a/src/test/locale/de_DE.ISO8859-1/Makefile +++ b/src/test/locale/de_DE.ISO8859-1/Makefile @@ -1,12 +1,7 @@ -# -# Makefile for example programs -# - all: - -@echo "make: Nothing to be done for \`all'." test: - @./runall + ./runall clean: rm -f *.out diff --git a/src/test/locale/gr_GR.ISO8859-7/Makefile b/src/test/locale/gr_GR.ISO8859-7/Makefile index 281014521e..fd8301928e 100644 --- a/src/test/locale/gr_GR.ISO8859-7/Makefile +++ b/src/test/locale/gr_GR.ISO8859-7/Makefile @@ -1,12 +1,7 @@ -# -# Makefile for example programs -# - all: - -@echo "make: Nothing to be done for \`all'." test: - @./runall + ./runall clean: rm -f *.out diff --git a/src/test/locale/koi8-r/Makefile b/src/test/locale/koi8-r/Makefile index 281014521e..fd8301928e 100644 --- a/src/test/locale/koi8-r/Makefile +++ b/src/test/locale/koi8-r/Makefile @@ -1,12 +1,7 @@ -# -# Makefile for example programs -# - all: - -@echo "make: Nothing to be done for \`all'." test: - @./runall + ./runall clean: rm -f *.out diff --git a/src/test/locale/koi8-to-win1251/Makefile b/src/test/locale/koi8-to-win1251/Makefile index 281014521e..fd8301928e 100644 --- a/src/test/locale/koi8-to-win1251/Makefile +++ b/src/test/locale/koi8-to-win1251/Makefile @@ -1,12 +1,7 @@ -# -# Makefile for example programs -# - all: - -@echo "make: Nothing to be done for \`all'." test: - @./runall + ./runall clean: rm -f *.out diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 4d19f9c0bb..3920e3da21 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -6,7 +6,7 @@ # Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.71 2008/01/01 19:46:00 momjian Exp $ +# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.72 2008/03/18 16:24:50 petere Exp $ # #------------------------------------------------------------------------- @@ -133,7 +133,7 @@ all-spi: # Tablespace setup .PHONY: tablespace-setup tablespace-setup: - -rm -rf ./testtablespace + rm -rf ./testtablespace mkdir ./testtablespace ## |
