1
0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00

contrib/check-hard: Indentation and spacing cleanup

* contrib/check-hard: Reduce the amount of text output to the
    screen. Also implement some indentation and whitespace cleanups.
This commit is contained in:
Darshit Shah 2015-06-15 01:35:53 +05:30
parent 5f0818d9f1
commit 103f940950

View File

@ -2,13 +2,15 @@
# #
# Do some checking before 'git push'. # Do some checking before 'git push'.
CORES=`grep -c ^processor /proc/cpuinfo 2>/dev/null || echo 0` # Set a stricter bash mode
set -e
set -u
CORES=$(grep -c ^processor /proc/cpuinfo 2> /dev/null || echo 0)
if [ $CORES -lt 1 ]; then CORES=1; fi if [ $CORES -lt 1 ]; then CORES=1; fi
make -f Makefile distclean 2>/dev/null echo "Running: make distclean"
make distclean > /dev/null || true
# automatically exit on error
set -e
CFLAGS="-std=c89 -pedantic -O2 -g -Wall -Wextra -Wstrict-prototypes -Wold-style-definition -Wwrite-strings -Wshadow -Wformat -Wformat-security -Wunreachable-code -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition" CFLAGS="-std=c89 -pedantic -O2 -g -Wall -Wextra -Wstrict-prototypes -Wold-style-definition -Wwrite-strings -Wshadow -Wformat -Wformat-security -Wunreachable-code -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition"
@ -17,13 +19,13 @@ CACHEFILE=$PWD/config_check.cache
# measure time consumed and print it at the end of the script # measure time consumed and print it at the end of the script
START=$(date +%s.%N) START=$(date +%s.%N)
echo "./bootstrap" echo "Running: ./bootstrap"
./bootstrap >/dev/null ./bootstrap > /dev/null
echo echo
for CC in gcc clang; do for CC in gcc clang; do
export CC export CC
echo "*** checking CC=$CC" echo "*** Testing with CC=$CC"
# the compiler changed, so we have to remove the cache file here # the compiler changed, so we have to remove the cache file here
rm -f $CACHEFILE rm -f $CACHEFILE
@ -31,20 +33,20 @@ for CC in gcc clang; do
for options in "" "--with-ssl=openssl"; do for options in "" "--with-ssl=openssl"; do
export DISTCHECK_CONFIGURE_FLAGS="-C --cache-file=$CACHEFILE $options" export DISTCHECK_CONFIGURE_FLAGS="-C --cache-file=$CACHEFILE $options"
echo " ./configure $DISTCHECK_CONFIGURE_FLAGS" echo " ./configure $DISTCHECK_CONFIGURE_FLAGS"
./configure $DISTCHECK_CONFIGURE_FLAGS CFLAGS="$CFLAGS" >/dev/null ./configure $DISTCHECK_CONFIGURE_FLAGS CFLAGS="$CFLAGS" > /dev/null
for xVALGRIND in 0 1; do for xVALGRIND in 0 1; do
for xLCALL in C tr_TR.utf8; do for xLCALL in C tr_TR.utf8; do
export TESTS_ENVIRONMENT="LC_ALL=$xLCALL VALGRIND_TESTS=$xVALGRIND" export TESTS_ENVIRONMENT="LC_ALL=$xLCALL VALGRIND_TESTS=$xVALGRIND"
echo " TESTS_ENVIRONMENT=\"$TESTS_ENVIRONMENT\"" make check -j$CORES echo " TESTS_ENVIRONMENT=\"$TESTS_ENVIRONMENT\"" make check -j$CORES
make check -j$CORES >/dev/null make check -j$CORES > /dev/null
done done
done done
unset TESTS_ENVIRONMENT unset TESTS_ENVIRONMENT
export TESTS_ENVIRONMENT export TESTS_ENVIRONMENT
echo " make distcheck -j$CORES" echo " make distcheck CFLAGS=$CFLAGS -j$CORES"
make distcheck CFLAGS="$CFLAGS" -j$CORES make distcheck CFLAGS="$CFLAGS" -j$CORES > /dev/null
done done
done done