diff options
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/isolation/Makefile | 13 | ||||
| -rw-r--r-- | src/test/isolation/isolation_main.c | 2 | ||||
| -rw-r--r-- | src/test/isolation/isolationtester.c | 6 | ||||
| -rw-r--r-- | src/test/isolation/specparse.y | 5 | ||||
| -rw-r--r-- | src/test/regress/expected/foreign_data.out | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile index 0f709a1e3c..6513b5f24e 100644 --- a/src/test/isolation/Makefile +++ b/src/test/isolation/Makefile @@ -10,7 +10,7 @@ ifeq ($(PORTNAME), win32) LDLIBS += -lws2_32 endif -override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS) +override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) -I$(srcdir)/../regress $(CPPFLAGS) override LDLIBS := $(libpq_pgport) $(LDLIBS) OBJS = specparse.o isolationtester.o @@ -64,7 +64,7 @@ endif clean distclean: rm -f isolationtester$(X) pg_isolation_regress$(X) $(OBJS) isolation_main.o rm -f pg_regress.o - rm -rf results + rm -rf $(pg_regress_clean_files) maintainer-clean: distclean rm -f specparse.c specscanner.c @@ -72,5 +72,10 @@ maintainer-clean: distclean installcheck: all ./pg_isolation_regress --inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule -check: all - ./pg_isolation_regress --temp-install=./tmp_check --inputdir=$(srcdir) --top-builddir=$(top_builddir) --schedule=$(srcdir)/isolation_schedule +# We can't support "make check" because isolationtester requires libpq, and +# in fact (on typical platforms using shared libraries) requires libpq to +# already be installed. You could run "make install" and then run a check +# using a temp installation, but there seems little point in that. +check: + @echo "'make check' is not supported." + @echo "Install PostgreSQL, then 'make installcheck' instead." diff --git a/src/test/isolation/isolation_main.c b/src/test/isolation/isolation_main.c index 2df12f879e..18cd8ef7fd 100644 --- a/src/test/isolation/isolation_main.c +++ b/src/test/isolation/isolation_main.c @@ -10,7 +10,7 @@ *------------------------------------------------------------------------- */ -#include "../regress/pg_regress.h" +#include "pg_regress.h" /* * start an isolation tester process for specified file (including diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c index 44a4858c96..0f77917fb5 100644 --- a/src/test/isolation/isolationtester.c +++ b/src/test/isolation/isolationtester.c @@ -5,14 +5,12 @@ * Runs an isolation test specified by a spec file. */ +#include "postgres_fe.h" + #ifdef WIN32 #include <windows.h> #endif -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include "libpq-fe.h" #include "isolationtester.h" diff --git a/src/test/isolation/specparse.y b/src/test/isolation/specparse.y index c684780216..47bfbc4f39 100644 --- a/src/test/isolation/specparse.y +++ b/src/test/isolation/specparse.y @@ -10,10 +10,7 @@ *------------------------------------------------------------------------- */ -#include <stdio.h> -#include <stdlib.h> -#include <stdint.h> -#include <string.h> +#include "postgres_fe.h" #include "isolationtester.h" diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out index 0dc7d045c7..e18eed8c1c 100644 --- a/src/test/regress/expected/foreign_data.out +++ b/src/test/regress/expected/foreign_data.out @@ -670,7 +670,7 @@ Has OIDs: no (1 row) CREATE INDEX id_ft1_c2 ON ft1 (c2); -- ERROR -ERROR: "ft1" is not a table +ERROR: cannot create index on foreign table "ft1" SELECT * FROM ft1; -- ERROR ERROR: foreign-data wrapper "dummy" has no handler EXPLAIN SELECT * FROM ft1; -- ERROR |