From 9b87c99ae52f97628ce02ee023f7530b1d730668 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 20 Jun 2017 15:17:08 -0400 Subject: [PATCH] Adjust "make check" to actually pass. The f_decls test doesn't quite pass currently, because there's too much whitespace in the function return types. We don't particularly care about this for PG purposes, as NetBSD indent did that too, and we've always had a fixup step for it in the pgindent wrapper script. So make the expected output file match what actually happens. (If this ever does get fixed by upstream, we can take that fixup step out of pgindent.) In passing, make the "make check" script less noisy. --- Makefile | 6 +++--- tests/f_decls.0.stdout | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e8768c8..8c5ff6e 100644 --- a/Makefile +++ b/Makefile @@ -20,9 +20,9 @@ PGXS := $(shell $(PG_CONFIG) --pgxs) include $(PGXS) check: $(PROGRAM) - rm -f tests.diff - cp $(srcdir)/tests/*.list . - for testsrc in $(srcdir)/tests/*.0; do \ + @rm -f tests.diff + @cp $(srcdir)/tests/*.list . + @for testsrc in $(srcdir)/tests/*.0; do \ test=`basename "$$testsrc" .0`; \ ./$(PROGRAM) $$testsrc $$test.out -P$(srcdir)/tests/$$test.pro || echo FAILED >>$$test.out; \ diff -u $$testsrc.stdout $$test.out >>tests.diff 2>&1 || true; \ diff --git a/tests/f_decls.0.stdout b/tests/f_decls.0.stdout index e4177df..bc21248 100644 --- a/tests/f_decls.0.stdout +++ b/tests/f_decls.0.stdout @@ -1,4 +1,4 @@ -char * +char * x(void) { type identifier; @@ -13,7 +13,7 @@ x(void) return NULL; } -int * +int * y(void) { -- 2.39.5