Repository: yetus Updated Branches: refs/heads/master 837e0fbc0 -> 580699ced
YETUS-113 On non-docker reexec, test patch mistakenly uses 'plugins' arg instead of 'user-plugins' 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/580699ce Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/580699ce Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/580699ce Branch: refs/heads/master Commit: 580699cedba949326f7f4103b857c7a073c9dc06 Parents: 837e0fb Author: Sean Busbey <[email protected]> Authored: Wed Oct 21 03:05:20 2015 -0500 Committer: Sean Busbey <[email protected]> Committed: Wed Oct 21 21:03:26 2015 -0500 ---------------------------------------------------------------------- dev-support/test-patch.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/yetus/blob/580699ce/dev-support/test-patch.sh ---------------------------------------------------------------------- diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index 784556c..8138491 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -1397,10 +1397,12 @@ function copytpbits mkdir -p "${PATCH_DIR}/precommit/test-patch-docker" # copy our entire universe, preserving links, etc. + yetus_debug "copying '${BINDIR}' over to '${PATCH_DIR}/precommit'" (cd "${BINDIR}"; tar cpf - . ) | (cd "${PATCH_DIR}/precommit"; tar xpf - ) if [[ -n "${USER_PLUGIN_DIR}" && -d "${USER_PLUGIN_DIR}" ]]; then + yetus_debug "copying '${USER_PLUGIN_DIR}' over to ${PATCH_DIR}/precommit/user-plugins" cp -pr "${USER_PLUGIN_DIR}/*" \ "${PATCH_DIR}/precommit/user-plugins" fi @@ -1409,11 +1411,13 @@ function copytpbits if [[ -n ${PERSONALITY} && -f ${PERSONALITY} ]]; then + yetus_debug "copying '${PERSONALITY}' over to '${PATCH_DIR}/precommit/personality/provided.sh'" cp -pr "${PERSONALITY}" "${PATCH_DIR}/precommit/personality/provided.sh" fi if [[ -n ${DOCKERFILE} && -f ${DOCKERFILE} ]]; then + yetus_debug "copying '${DOCKERFILE}' over to '${PATCH_DIR}/precommit/test-patch-docker/Dockerfile'" dockerdir=$(dirname "${DOCKERFILE}") dockfile=$(basename "${DOCKERFILE}") pushd "${dockerdir}" >/dev/null @@ -1562,7 +1566,7 @@ function check_reexec --tpreexectimer="${TIMER}" \ --personality="${PERSONALITY}" \ --tpinstance="${INSTANCE}" \ - --plugins="${USER_PLUGIN_DIR}" + --user-plugins="${USER_PLUGIN_DIR}" fi }
