You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nd...@apache.org on 2020/03/26 15:48:21 UTC
[hbase] branch branch-2.3 updated: HBASE-24045 Support setting
`-Dhadoop.profile` in adhoc_run_tests.sh ADDENDUM
This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.3 by this push:
new 00c8ccd HBASE-24045 Support setting `-Dhadoop.profile` in adhoc_run_tests.sh ADDENDUM
00c8ccd is described below
commit 00c8ccd70fe6feedc6fb0c660f3f3abb779a9449
Author: Nick Dimiduk <nd...@apache.org>
AuthorDate: Wed Mar 25 17:19:15 2020 -0700
HBASE-24045 Support setting `-Dhadoop.profile` in adhoc_run_tests.sh ADDENDUM
* Correctly handle the hadoop2 profile.
* Create the output directory if it doesn't exist
---
dev-support/adhoc_run_tests/adhoc_run_tests.sh | 27 +++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/dev-support/adhoc_run_tests/adhoc_run_tests.sh b/dev-support/adhoc_run_tests/adhoc_run_tests.sh
index 79a2c8f..fad7fff 100755
--- a/dev-support/adhoc_run_tests/adhoc_run_tests.sh
+++ b/dev-support/adhoc_run_tests/adhoc_run_tests.sh
@@ -35,7 +35,7 @@ declare fork_count="0.5C"
declare -i attempts=1
declare maven_repo="${HOME}/.m2/repository"
declare output="."
-declare hadoop_profile='2.0'
+declare hadoop_profile
while [ $# -gt 0 ]
do
case "$1" in
@@ -84,25 +84,30 @@ for test in "${@}"; do
for module in $(find_modules "${test}"); do
if [[ ! "${modules[*]}" =~ ${module} ]]; then
echo "adding module '${module}' to set."
- modules+=(${module})
+ modules+=("${module}")
fi
done
done
declare -a mvn_module_arg
-
for module in "${modules[@]}"; do
mvn_module_arg+=(-pl "${module}")
done
+
declare tests="${*}"
+declare -a maven_args=('--batch-mode' "-Dmaven.repo.local=${maven_repo}" "-Dtest=${tests// /,}"
+ '-Dsurefire.rerunFailingTestsCount=0' "-Dsurefire.parallel.forcedTimeout=${force_timeout}"
+ '-Dsurefire.shutdown=kill' '-DtrimStackTrace=false' '-am' "${mvn_module_arg[@]}"
+ "-DforkCount=${fork_count}" test)
+if [[ -n "${hadoop_profile}" ]] ; then
+ maven_args+=("-Dhadoop.profile=${hadoop_profile}")
+fi
+
+if [[ ! -d "${output}" ]] ; then
+ mkdir -p "${output}"
+fi
+
for attempt in $(seq "${attempts}"); do
echo "Attempt ${attempt}" >&2
- echo_run_redirect "${output}/mvn_test.log" mvn --batch-mode \
- -Dhadoop.profile="${hadoop_profile}" \
- -Dmaven.repo.local="${maven_repo}" \
- -Dtest="${tests// /,}" \
- -Dsurefire.rerunFailingTestsCount=0 -Dsurefire.parallel.forcedTimeout="${force_timeout}" \
- -Dsurefire.shutdown=kill -DtrimStackTrace=false -am "${mvn_module_arg[@]}" \
- -DforkCount="${fork_count}" \
- test
+ echo_run_redirect "${output}/mvn_test.log" mvn "${maven_args[@]}"
done