Merge pull request #2639 from mpg/use-all-sh-checks-for-pre-push
Use all.sh and its component list in pre-push hook
diff --git a/tests/git-scripts/pre-push.sh b/tests/git-scripts/pre-push.sh
index d3b4629..b9cdc0e 100755
--- a/tests/git-scripts/pre-push.sh
+++ b/tests/git-scripts/pre-push.sh
@@ -45,18 +45,4 @@
set -eu
-run_test()
-{
- TEST=$1
- echo "running '$TEST'"
- if ! `$TEST > /dev/null 2>&1`; then
- echo "test '$TEST' failed"
- return 1
- fi
-}
-
-run_test ./tests/scripts/check-doxy-blocks.pl
-run_test ./tests/scripts/check-names.sh
-run_test ./tests/scripts/check-generated-files.sh
-run_test ./tests/scripts/check-files.py
-run_test ./tests/scripts/doxygen.sh
+tests/scripts/all.sh -q -k 'check_*'
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index e18d91a..01f5910 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -133,6 +133,7 @@
append_outcome=0
MEMORY=0
FORCE=0
+ QUIET=0
KEEP_GOING=0
# Seed value used with the --release-test option.
@@ -221,6 +222,7 @@
--list-components List components supported on this platform and exit.
General options:
+ -q|--quiet Only output component names, and errors if any.
-f|--force Force the tests to overwrite any modified files.
-k|--keep-going Run all tests and report errors at the end.
-m|--memory Additional optional memory tests.
@@ -236,6 +238,7 @@
--no-force Refuse to overwrite modified files (default).
--no-keep-going Stop at the first error (default).
--no-memory No additional memory tests (default).
+ --no-quiet Print full ouput from components.
--out-of-source-dir=<path> Directory used for CMake out-of-source build tests.
--outcome-file=<path> File where test outcomes are written (not done if
empty; default: \$MBEDTLS_TEST_OUTCOME_FILE).
@@ -309,6 +312,11 @@
else
current_section="$1"
fi
+
+ if [ $QUIET -eq 1 ]; then
+ return
+ fi
+
echo ""
echo "******************************************************************"
echo "* $current_section "
@@ -384,11 +392,13 @@
--no-force) FORCE=0;;
--no-keep-going) KEEP_GOING=0;;
--no-memory) MEMORY=0;;
+ --no-quiet) QUIET=0;;
--openssl) shift; OPENSSL="$1";;
--openssl-legacy) shift; OPENSSL_LEGACY="$1";;
--openssl-next) shift; OPENSSL_NEXT="$1";;
--outcome-file) shift; MBEDTLS_TEST_OUTCOME_FILE="$1";;
--out-of-source-dir) shift; OUT_OF_SOURCE_DIR="$1";;
+ --quiet|-q) QUIET=1;;
--random-seed) unset SEED;;
--release-test|-r) SEED=$RELEASE_SEED;;
--seed|-s) shift; SEED="$1";;
@@ -470,7 +480,7 @@
failure_summary="$failure_summary
$text"
failure_count=$((failure_count + 1))
- echo "${start_red}^^^^$text^^^^${end_color}"
+ echo "${start_red}^^^^$text^^^^${end_color}" >&2
fi
}
make () {
@@ -516,6 +526,24 @@
! "$@"
}
+pre_setup_quiet_redirect () {
+ if [ $QUIET -ne 1 ]; then
+ redirect_out () {
+ "$@"
+ }
+ redirect_err () {
+ "$@"
+ }
+ else
+ redirect_out () {
+ "$@" >/dev/null
+ }
+ redirect_err () {
+ "$@" 2>/dev/null
+ }
+ fi
+}
+
pre_prepare_outcome_file () {
case "$MBEDTLS_TEST_OUTCOME_FILE" in
[!/]*) MBEDTLS_TEST_OUTCOME_FILE="$PWD/$MBEDTLS_TEST_OUTCOME_FILE";;
@@ -526,6 +554,10 @@
}
pre_print_configuration () {
+ if [ $QUIET -eq 1 ]; then
+ return
+ fi
+
msg "info: $0 configuration"
echo "MEMORY: $MEMORY"
echo "FORCE: $FORCE"
@@ -600,6 +632,11 @@
"$ARMC6_CC" "$ARMC6_AR" "$ARMC6_FROMELF";;
esac
+ # past this point, no call to check_tool, only printing output
+ if [ $QUIET -eq 1 ]; then
+ return
+ fi
+
msg "info: output_env.sh"
case $RUN_COMPONENTS in
*_armcc*)
@@ -665,7 +702,13 @@
component_check_test_cases () {
msg "Check: test case descriptions" # < 1s
- record_status tests/scripts/check-test-cases.py
+ if [ $QUIET -eq 1 ]; then
+ opt='--quiet'
+ else
+ opt=''
+ fi
+ record_status tests/scripts/check-test-cases.py $opt
+ unset opt
}
component_check_doxygen_warnings () {
@@ -1919,7 +1962,10 @@
component_check_generate_test_code () {
msg "uint test: generate_test_code.py"
- record_status ./tests/scripts/test_generate_test_code.py
+ # unittest writes out mundane stuff like number or tests run on stderr.
+ # Our convention is to reserve stderr for actual errors, and write
+ # harmless info on stdout so it can be suppress with --quiet.
+ record_status ./tests/scripts/test_generate_test_code.py 2>&1
}
################################################################
@@ -1950,13 +1996,18 @@
# Unconditionally create a seedfile that's sufficiently long.
# Do this before each component, because a previous component may
# have messed it up or shortened it.
- dd if=/dev/urandom of=./tests/seedfile bs=64 count=1
+ redirect_err dd if=/dev/urandom of=./tests/seedfile bs=64 count=1
# Run the component code.
- "$@"
+ if [ $QUIET -eq 1 ]; then
+ # msg() is silenced, so just print the component name here
+ echo "${current_component#component_}"
+ fi
+ redirect_out "$@"
# Restore the build tree to a clean state.
cleanup
+ unset current_component
}
# Preliminary setup
@@ -1974,6 +2025,7 @@
"$@"
}
fi
+pre_setup_quiet_redirect
pre_prepare_outcome_file
pre_print_configuration
pre_check_tools