Commit16db57c

authored and

committed

Fix headerscheck and cpluspluscheck's exit codes.

For the benefit of CI, which started running these header check scriptsin its CompilerWarnings task in commit81b9f23, they should reportfailure if any individual header failed to compile.Reviewed-by: Andrew Dunstan <andrew@dunslane.net>Reviewed-by: Andres Freund <andres@anarazel.de>Discussion:https://postgr.es/m/CA%2BhUKGKtDwPo9wzKgbStDwfOhEpywMc6PQofio8fAHR7yUjgxw%40mail.gmail.com

1 parent6f0aee1 commit16db57cCopy full SHA for 16db57c

File tree

+16

-4

lines changed

+16

-4

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -52,6 +52,8 @@ tmp=`mktemp -d /tmp/$me.XXXXXX`
`52`	`52`
`53`	`53`	`trap'rm -rf $tmp' 0 1 2 3 15`
`54`	`54`
	`55`	`+exit_status=0`
	`56`	`+`
`55`	`57`	`# Scan all of src/ and contrib/ for header files.`
`56`	`58`	forfin`cd"$srcdir"&& find src contrib -name'*.h' -print`
`57`	`59`	`do`
`@@ -167,9 +169,13 @@ do`
`167`	`169`	`esac`
`168`	`170`
`169`	`171`	`# Run the test.`
`170`		`-${CXX:-g++} -I$builddir -I$srcdir \`
	`172`	`+if!${CXX:-g++} -I$builddir -I$srcdir \`
`171`	`173`	`-I$builddir/src/include -I$srcdir/src/include \`
`172`	`174`	`-I$builddir/src/interfaces/libpq -I$srcdir/src/interfaces/libpq \`
`173`	`175`	`$EXTRAINCLUDES$EXTRAFLAGS$CXXFLAGS -c$tmp/test.cpp`
`174`		`-`
	`176`	`+then`
	`177`	`+exit_status=1`
	`178`	`+fi`
`175`	`179`	`done`
	`180`	`+`
	`181`	`+exit$exit_status`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -48,6 +48,8 @@ tmp=`mktemp -d /tmp/$me.XXXXXX`
`48`	`48`
`49`	`49`	`trap'rm -rf $tmp' 0 1 2 3 15`
`50`	`50`
	`51`	`+exit_status=0`
	`52`	`+`
`51`	`53`	`# Scan all of src/ and contrib/ for header files.`
`52`	`54`	forfin`cd"$srcdir"&& find src contrib -name'*.h' -print`
`53`	`55`	`do`
`@@ -150,9 +152,13 @@ do`
`150`	`152`	`esac`
`151`	`153`
`152`	`154`	`# Run the test.`
`153`		`-${CC:-gcc}$CPPFLAGS$CFLAGS -I$builddir -I$srcdir \`
	`155`	`+if!${CC:-gcc}$CPPFLAGS$CFLAGS -I$builddir -I$srcdir \`
`154`	`156`	`-I$builddir/src/include -I$srcdir/src/include \`
`155`	`157`	`-I$builddir/src/interfaces/libpq -I$srcdir/src/interfaces/libpq \`
`156`	`158`	`$EXTRAINCLUDES$EXTRAFLAGS -c$tmp/test.c -o$tmp/test.o`
`157`		`-`
	`159`	`+then`
	`160`	`+exit_status=1`
	`161`	`+fi`
`158`	`162`	`done`
	`163`	`+`
	`164`	`+exit$exit_status`

Comments

(0)