Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commiteff223f

Browse files
committed
Fix some portability issues in isolation regression test driver.
Remove random system #includes in favor of using postgres_fe.h. (Thealternative to that is letting this module grow its own configurationtesting ability...)Also fix the "make clean" target to actually clean things up.Per local testing.
1 parente6a7402 commiteff223f

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

‎src/test/isolation/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ifeq ($(PORTNAME), win32)
1010
LDLIBS += -lws2_32
1111
endif
1212

13-
overrideCPPFLAGS := -I$(srcdir) -I$(libpq_srcdir)$(CPPFLAGS)
13+
overrideCPPFLAGS := -I$(srcdir) -I$(libpq_srcdir)-I$(srcdir)/../regress$(CPPFLAGS)
1414
overrideLDLIBS :=$(libpq_pgport)$(LDLIBS)
1515

1616
OBJS = specparse.o isolationtester.o
@@ -64,7 +64,7 @@ endif
6464
cleandistclean:
6565
rm -f isolationtester$(X) pg_isolation_regress$(X)$(OBJS) isolation_main.o
6666
rm -f pg_regress.o
67-
rm -rfresults
67+
rm -rf$(pg_regress_clean_files)
6868

6969
maintainer-clean: distclean
7070
rm -f specparse.c specscanner.c

‎src/test/isolation/isolation_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*-------------------------------------------------------------------------
1111
*/
1212

13-
#include"../regress/pg_regress.h"
13+
#include"pg_regress.h"
1414

1515
/*
1616
* start an isolation tester process for specified file (including

‎src/test/isolation/isolationtester.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
*Runs an isolation test specified by a spec file.
66
*/
77

8+
#include"postgres_fe.h"
9+
810
#ifdefWIN32
911
#include<windows.h>
1012
#endif
1113

12-
#include<stddef.h>
13-
#include<stdio.h>
14-
#include<stdlib.h>
15-
#include<string.h>
1614
#include"libpq-fe.h"
1715

1816
#include"isolationtester.h"

‎src/test/isolation/specparse.y

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
*-------------------------------------------------------------------------
1111
*/
1212

13-
#include<stdio.h>
14-
#include<stdlib.h>
15-
#include<stdint.h>
16-
#include<string.h>
13+
#include"postgres_fe.h"
1714

1815
#include"isolationtester.h"
1916

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp