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
Appearance settings

Commit 85f65d7

Browse filesBrowse files
hlinnakahlinnaka
committed
Try to unbreak injection-fault tests in the buildfarm
The buildfarm script attempts to run all tests marked as NO_INSTALLCHECK under src/test/modules without paying attention to whether they are enabled or disabled in the parent Makefile. That hasn't been a problem so far, because all the tests marked with NO_INSTALLCHECK ran unconditionally in "make check". But commit e2e3b8a changed that: the injection fault tests are marked as NO_INSTALLCHECK, and also depend on --enable-injection-points. Try to work around that by ensuring that "make check" does nothing in the those subdirectories. We can hopefully get rid of this hack soon, after fixing the buildfarm client, or by switching to meson. Discussion: https://www.postgresql.org/message-id/8e4cf596-dd70-432e-9068-16466ed596ed%40iki.fi
1 parent 7a65cc0 commit 85f65d7
Copy full SHA for 85f65d7

File tree

Expand file treeCollapse file tree

2 files changed

+24
-0
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+24
-0
lines changed

‎src/test/modules/gin/Makefile

Copy file name to clipboardExpand all lines: src/test/modules/gin/Makefile
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,17 @@ else
1515
subdir = src/test/modules/gin
1616
top_builddir = ../../../..
1717
include $(top_builddir)/src/Makefile.global
18+
19+
# XXX: This test is conditional on enable_injection_points in the
20+
# parent Makefile, so we should never get here in the first place if
21+
# injection points are not enabled. But the buildfarm 'misc-check'
22+
# step doesn't pay attention to the if-condition in the parent
23+
# Makefile. To work around that, disable running the test here too.
24+
ifeq ($(enable_injection_points),yes)
1825
include $(top_srcdir)/contrib/contrib-global.mk
26+
else
27+
check:
28+
@echo "injection points are disabled in this build"
29+
endif
30+
1931
endif

‎src/test/modules/injection_points/Makefile

Copy file name to clipboardExpand all lines: src/test/modules/injection_points/Makefile
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,17 @@ else
1919
subdir = src/test/modules/injection_points
2020
top_builddir = ../../../..
2121
include $(top_builddir)/src/Makefile.global
22+
23+
# XXX: This test is conditional on enable_injection_points in the
24+
# parent Makefile, so we should never get here in the first place if
25+
# injection points are not enabled. But the buildfarm 'misc-check'
26+
# step doesn't pay attention to the if-condition in the parent
27+
# Makefile. To work around that, disable running the test here too.
28+
ifeq ($(enable_injection_points),yes)
2229
include $(top_srcdir)/contrib/contrib-global.mk
30+
else
31+
check:
32+
@echo "injection points are disabled in this build"
33+
endif
34+
2335
endif

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.