Commit eff223ff authored by Tom Lane's avatar Tom Lane

Fix some portability issues in isolation regression test driver.

Remove random system #includes in favor of using postgres_fe.h.  (The
alternative to that is letting this module grow its own configuration
testing ability...)

Also fix the "make clean" target to actually clean things up.

Per local testing.
parent e6a74028
...@@ -10,7 +10,7 @@ ifeq ($(PORTNAME), win32) ...@@ -10,7 +10,7 @@ ifeq ($(PORTNAME), win32)
LDLIBS += -lws2_32 LDLIBS += -lws2_32
endif 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) override LDLIBS := $(libpq_pgport) $(LDLIBS)
OBJS = specparse.o isolationtester.o OBJS = specparse.o isolationtester.o
...@@ -64,7 +64,7 @@ endif ...@@ -64,7 +64,7 @@ endif
clean distclean: clean distclean:
rm -f isolationtester$(X) pg_isolation_regress$(X) $(OBJS) isolation_main.o rm -f isolationtester$(X) pg_isolation_regress$(X) $(OBJS) isolation_main.o
rm -f pg_regress.o rm -f pg_regress.o
rm -rf results rm -rf $(pg_regress_clean_files)
maintainer-clean: distclean maintainer-clean: distclean
rm -f specparse.c specscanner.c rm -f specparse.c specscanner.c
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include "../regress/pg_regress.h" #include "pg_regress.h"
/* /*
* start an isolation tester process for specified file (including * start an isolation tester process for specified file (including
......
...@@ -5,14 +5,12 @@ ...@@ -5,14 +5,12 @@
* Runs an isolation test specified by a spec file. * Runs an isolation test specified by a spec file.
*/ */
#include "postgres_fe.h"
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#endif #endif
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "libpq-fe.h" #include "libpq-fe.h"
#include "isolationtester.h" #include "isolationtester.h"
......
...@@ -10,10 +10,7 @@ ...@@ -10,10 +10,7 @@
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include <stdio.h> #include "postgres_fe.h"
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include "isolationtester.h" #include "isolationtester.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment