mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve pginclude tests.

Browse Source
This commit is contained in:
Bruce Momjian 2006-07-11 20:51:25 +00:00
parent 4084681546
commit 1be8f80288
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/tools/pginclude/pgrminclude
View File

@ -1,7 +1,7 @@
:
# remove extra #include's
# $PostgreSQL: pgsql/src/tools/pginclude/pgrminclude,v 1.11 2006/07/11 20:12:29 momjian Exp $
# $PostgreSQL: pgsql/src/tools/pginclude/pgrminclude,v 1.12 2006/07/11 20:51:25 momjian Exp $
trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15
find . \( -name CVS -a -prune \) -o -type f -name '*.[ch]' -print |
@ -35,9 +35,9 @@ do
# preserve configure-specific includes
# these includes are surrounded by #ifdef's
grep -B1 '^#include[ ][ ]*[<"]'"$INCLUDE"'[>"]' "$FILE" |
egrep -q '^#if|^#else' && continue
egrep -q '^#if|^#else' && continue
grep -A1 '^#include[ ][ ]*[<"]'"$INCLUDE"'[>"]' "$FILE" |
egrep -q '^#else|^#endif' && continue
egrep -q '^#else|^#endif' && continue
# set up initial file contents
cat /tmp/$$a |
@ -61,12 +61,16 @@ do
-o /tmp/$$.o >/tmp/$$ 2>&1
if [ "$?" -eq 0 ]
then echo "$FILE $INCLUDE"
if [ "$1" = "-v" ]
then cat /tmp/$$
cat /tmp/$$b
cat /tmp/$$.c
fi
grep -v '^#include[ ][ ]*[<"]'"$INCLUDE"'[>"]' "$FILE" >/tmp/$$b
mv /tmp/$$b "$FILE"
elif [ "$1" = "-v" ]
then echo "$FILE"
fi
if [ "$1" = "-v" ]
then cat /tmp/$$
cat /tmp/$$.c
fi
done
done