You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2018/03/16 00:58:12 UTC
[6/6] lucene-solr:branch_7x: SOLR-10912: personality fix: in
solr-ref-guide, don't run compile and unit plugins. Also,
consistently use curly brackets when interpolating variables
SOLR-10912: personality fix: in solr-ref-guide, don't run compile and unit plugins. Also, consistently use curly brackets when interpolating variables
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1c31773f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1c31773f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1c31773f
Branch: refs/heads/branch_7x
Commit: 1c31773fa303e5a48efb1e8af3efae8cd844d760
Parents: a3980ad
Author: Steve Rowe <sa...@apache.org>
Authored: Thu Mar 15 20:18:28 2018 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Thu Mar 15 20:57:45 2018 -0400
----------------------------------------------------------------------
.../test-patch/lucene-solr-yetus-personality.sh | 61 +++++++++++---------
1 file changed, 33 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1c31773f/dev-tools/test-patch/lucene-solr-yetus-personality.sh
----------------------------------------------------------------------
diff --git a/dev-tools/test-patch/lucene-solr-yetus-personality.sh b/dev-tools/test-patch/lucene-solr-yetus-personality.sh
index 3e1becf..4e08aa5 100644
--- a/dev-tools/test-patch/lucene-solr-yetus-personality.sh
+++ b/dev-tools/test-patch/lucene-solr-yetus-personality.sh
@@ -113,48 +113,51 @@ function personality_modules
case ${moduleType} in
submodules)
for module in "${CHANGED_MODULES[@]}"; do
- if [[ ! "$module" =~ ^lucene/(licenses|site) ]]; then # blacklist lucene/ dirs that aren't modules
- if [[ "$module" =~ ^(lucene/(analysis/[^/]+|[^/]+)) ]]; then
- lucene_module=${BASH_REMATCH[0]}
- personality_enqueue_module "${lucene_module}" "$extra"
- elif [[ "$module" =~ ^solr/(core|solrj|test-framework|solr-ref-guide|contrib/[^.]+) ]]; then # whitelist solr/ modules
- solr_module=${BASH_REMATCH[0]}
- personality_enqueue_module "${solr_module}" "$extra"
+ if [[ ! "${module}" =~ ^lucene/(licenses|site) ]]; then # blacklist lucene/ dirs that aren't modules
+ if [[ "${module}" =~ ^(lucene/(analysis/[^/]+|[^/]+)) ]]; then
+ local lucene_module=${BASH_REMATCH[0]}
+ personality_enqueue_module "${lucene_module}" "${extra}"
+ elif [[ "${module}" =~ ^solr/(core|solrj|test-framework|solr-ref-guide|contrib/[^.]+) ]]; then # whitelist solr/ modules
+ local solr_module=${BASH_REMATCH[0]}
+ # In solr-ref-guide module, do not execute "compile" or "unit" plugins
+ if [[ ! "${solr_module}" == solr/solr-ref-guide || ! ${testtype} =~ ^(compile|unit)$ ]]; then
+ personality_enqueue_module "${solr_module}" "${extra}"
+ fi
fi
fi
done
;;
lucene|solr)
- personality_enqueue_module "${moduleType}" "$extra"
+ personality_enqueue_module "${moduleType}" "${extra}"
;;
top)
- personality_enqueue_module . "$extra"
+ personality_enqueue_module . "${extra}"
;;
mains)
- personality_enqueue_module "lucene" "$extra"
- personality_enqueue_module "solr" "$extra"
+ personality_enqueue_module "lucene" "${extra}"
+ personality_enqueue_module "solr" "${extra}"
;;
both) # solr, lucene, or both
# personality_enqueue_module KEEPS duplicates, so de-dupe first
local doSolr=0,doLucene=0
for module in "${CHANGED_MODULES[@]}"; do
- if [[ "$module" =~ ^solr/ ]]; then doSolr=1; fi
- if [[ "$module" =~ ^lucene/ ]]; then doLucene=1; fi
+ if [[ "${module}" =~ ^solr/ ]]; then doSolr=1; fi
+ if [[ "${module}" =~ ^lucene/ ]]; then doLucene=1; fi
done
- if [[ $doLucene == 1 ]]; then
- if [[ $doSolr == 1 ]]; then
- personality_enqueue_module . "$extra"
+ if [[ ${doLucene} == 1 ]]; then
+ if [[ ${doSolr} == 1 ]]; then
+ personality_enqueue_module . "${extra}"
else
- personality_enqueue_module "lucene" "$extra"
+ personality_enqueue_module "lucene" "${extra}"
fi
- elif [[ $doSolr == 1 ]]; then
- personality_enqueue_module "solr" "$extra"
+ elif [[ ${doSolr} == 1 ]]; then
+ personality_enqueue_module "solr" "${extra}"
fi
;;
solr-ref-guide)
for module in "${CHANGED_MODULES[@]}"; do
- if [[ "$module" =~ ^solr/solr-ref-guide ]]; then
- personality_enqueue_module "solr/solr-ref-guide" "$extra"
+ if [[ "${module}" =~ ^solr/solr-ref-guide ]]; then
+ personality_enqueue_module "solr/solr-ref-guide" "${extra}"
fi
done
;;
@@ -173,11 +176,13 @@ function personality_file_tests
yetus_debug "Using Lucene/Solr-specific personality_file_tests"
- if [[ ${filename} =~ build\.xml$ || ${filename} =~ /src/(java|resources|test|test-files|tools) ]]; then
- yetus_debug "tests/unit: ${filename}"
- add_test compile
- add_test javac
- add_test unit
+ if [[ ! ${filename} =~ solr-ref-guide ]]; then
+ if [[ ${filename} =~ build\.xml$ || ${filename} =~ /src/(java|resources|test|test-files|tools) ]]; then
+ yetus_debug "tests/unit: ${filename}"
+ add_test compile
+ add_test javac
+ add_test unit
+ fi
fi
}
@@ -364,7 +369,7 @@ function lucene_ant_command
fi
big_console_header "${title}"
- personality_modules $repostatus $testname
+ personality_modules ${repostatus} ${testname}
until [[ ${i} -eq ${#MODULE[@]} ]]; do
if [[ ${MODULE_STATUS[${i}]} == -1 ]]; then
((result=result+1))
@@ -374,7 +379,7 @@ function lucene_ant_command
ANT_ARGS=${antcommand}
start_clock
- module=${MODULE[$i]}
+ module=${MODULE[${i}]}
fn=$(module_file_fragment "${module}")
logfilename="${repostatus}-${antcommand}-${fn}.txt";
logfile="${PATCH_DIR}/${logfilename}"