Repository: yetus Updated Branches: refs/heads/YETUS-156 a0d4f11ec -> 2a11f5e81
YETUS-374. need a way to ignore results from a list of tests Signed-off-by: Allen Wittenauer <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/yetus/repo Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/2a11f5e8 Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/2a11f5e8 Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/2a11f5e8 Branch: refs/heads/YETUS-156 Commit: 2a11f5e810333d4a54c8445ce6b7dc0914f20c65 Parents: a0d4f11 Author: Allen Wittenauer <[email protected]> Authored: Tue Apr 12 14:35:26 2016 -0700 Committer: Allen Wittenauer <[email protected]> Committed: Tue Apr 12 22:19:56 2016 -0700 ---------------------------------------------------------------------- precommit/test-patch.sh | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/yetus/blob/2a11f5e8/precommit/test-patch.sh ---------------------------------------------------------------------- diff --git a/precommit/test-patch.sh b/precommit/test-patch.sh index 9fb26dc..5f7dfd9 100755 --- a/precommit/test-patch.sh +++ b/precommit/test-patch.sh @@ -236,12 +236,15 @@ function add_header_line ## @return Elapsed time display function add_vote_table { - local value=$1 - local subsystem=$2 + declare value=$1 + declare subsystem=$2 shift 2 - local calctime - local -r elapsed=$(stop_clock) + declare calctime + # apparently shellcheck doesn't know about declare -r + #shellcheck disable=SC2155 + declare -r elapsed=$(stop_clock) + declare filt yetus_debug "add_vote_table ${value} ${subsystem} ${*}" @@ -251,6 +254,12 @@ function add_vote_table value="+1" fi + for filt in "${VOTE_FILTER[@]}"; do + if [[ "${subsystem}" = "${filt}" ]]; then + value=0 + fi + done + if [[ -z ${value} ]]; then # shellcheck disable=SC2034 TP_VOTE_TABLE[${TP_VOTE_COUNTER}]="| | ${subsystem} | | ${*:-} |" @@ -259,6 +268,10 @@ function add_vote_table TP_VOTE_TABLE[${TP_VOTE_COUNTER}]="| ${value} | ${subsystem} | ${calctime} | $* |" fi ((TP_VOTE_COUNTER=TP_VOTE_COUNTER+1)) + + if [[ "${value}" = -1 ]]; then + ((RESULT = RESULT + 1)) + fi } ## @description Report the JVM version of the given directory @@ -709,6 +722,7 @@ function yetus_usage yetus_add_option "--summarize=<bool>" "Allow tests to summarize results" yetus_add_option "--test-parallel=<bool>" "Run multiple tests in parallel (default false in developer mode, true in Jenkins mode)" yetus_add_option "--test-threads=<int>" "Number of tests to run in parallel (default defined in ${PROJECT_NAME} build)" + yetus_add_option "--tests-filter=<list>" "Lists of tests to turn failures into warnings" yetus_add_option "--user-plugins=<dir>" "A directory of user provided plugins. see test-patch.d for examples (default empty)" yetus_add_option "--version" "Print release version information and exit" @@ -884,6 +898,9 @@ function parse_args # shellcheck disable=SC2034 TEST_THREADS=${i#*=} ;; + --tests-filter=*) + yetus_comma_to_array VOTE_FILTER "${i#*=}" + ;; --tpglobaltimer=*) GLOBALTIMER=${i#*=} ;; @@ -2272,8 +2289,6 @@ function runtests verify_patchdir_still_exists check_unittests - - (( RESULT = RESULT + $? )) fi for plugin in ${TESTTYPES}; do @@ -2283,7 +2298,6 @@ function runtests yetus_debug "Running ${plugin}_tests" #shellcheck disable=SC2086 ${plugin}_tests - (( RESULT = RESULT + $? )) fi done } @@ -3043,10 +3057,8 @@ prechecks if [[ "${BUILDMODE}" = patch ]]; then patchfiletests - ((RESULT=RESULT+$?)) compile_cycle branch - ((RESULT=RESULT+$?)) distclean @@ -3056,10 +3068,8 @@ if [[ "${BUILDMODE}" = patch ]]; then fi compile_cycle patch -((RESULT=RESULT+$?)) runtests -((RESULT=RESULT+$?)) finish_vote_table
