Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 28bdfa2

Browse files
committed
Print information about type of test and subdirectory before running tests.
When testing check-world it's hard to know what the test the test failure output belongs to. The tap test output is especially problematic, partially due to our practice of reusing test names like 001_basic.pl. This isn't a real issue on the buildfarm, which invokes tests separately, but locally and for CI it's quite annoying. To fix, the test target provisos in Makefile.global.in now output echo "+++ (regress|isolation|tap) [install-]check in $(subdir) +++" before running the tests. Discussion: https://postgr.es/m/20220330165039.3zseuiraxfjkksf5@alap3.anarazel.de
1 parent d5f43a1 commit 28bdfa2

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/Makefile.global.in

+7
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ ifeq ($(enable_tap_tests),yes)
448448

449449
ifndef PGXS
450450
define prove_installcheck
451+
echo "+++ tap install-check in $(subdir) +++" && \
451452
rm -rf '$(CURDIR)'/tmp_check && \
452453
$(MKDIR_P) '$(CURDIR)'/tmp_check && \
453454
cd $(srcdir) && \
@@ -458,6 +459,7 @@ cd $(srcdir) && \
458459
endef
459460
else # PGXS case
460461
define prove_installcheck
462+
echo "+++ tap install-check in $(subdir) +++" && \
461463
rm -rf '$(CURDIR)'/tmp_check && \
462464
$(MKDIR_P) '$(CURDIR)'/tmp_check && \
463465
cd $(srcdir) && \
@@ -469,6 +471,7 @@ endef
469471
endif # PGXS
470472

471473
define prove_check
474+
echo "+++ tap check in $(subdir) +++" && \
472475
rm -rf '$(CURDIR)'/tmp_check && \
473476
$(MKDIR_P) '$(CURDIR)'/tmp_check && \
474477
cd $(srcdir) && \
@@ -663,6 +666,7 @@ pg_regress_locale_flags = $(if $(ENCODING),--encoding=$(ENCODING)) $(NOLOCALE)
663666
pg_regress_clean_files = results/ regression.diffs regression.out tmp_check/ tmp_check_iso/ log/ output_iso/
664667

665668
pg_regress_check = \
669+
echo "+++ regress check in $(subdir) +++" && \
666670
$(with_temp_install) \
667671
$(top_builddir)/src/test/regress/pg_regress \
668672
--temp-instance=./tmp_check \
@@ -671,12 +675,14 @@ pg_regress_check = \
671675
$(TEMP_CONF) \
672676
$(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS)
673677
pg_regress_installcheck = \
678+
echo "+++ regress install-check in $(subdir) +++" && \
674679
$(top_builddir)/src/test/regress/pg_regress \
675680
--inputdir=$(srcdir) \
676681
--bindir='$(bindir)' \
677682
$(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS)
678683

679684
pg_isolation_regress_check = \
685+
echo "+++ isolation check in $(subdir) +++" && \
680686
$(with_temp_install) \
681687
$(top_builddir)/src/test/isolation/pg_isolation_regress \
682688
--temp-instance=./tmp_check_iso \
@@ -685,6 +691,7 @@ pg_isolation_regress_check = \
685691
$(TEMP_CONF) \
686692
$(pg_regress_locale_flags) $(EXTRA_REGRESS_OPTS)
687693
pg_isolation_regress_installcheck = \
694+
echo "+++ isolation install-check in $(subdir) +++" && \
688695
$(top_builddir)/src/test/isolation/pg_isolation_regress \
689696
--inputdir=$(srcdir) --outputdir=output_iso \
690697
--bindir='$(bindir)' \

0 commit comments

Comments
 (0)