Return-Path: X-Original-To: apmail-yetus-commits-archive@minotaur.apache.org Delivered-To: apmail-yetus-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C66DD184BD for ; Thu, 29 Oct 2015 15:06:12 +0000 (UTC) Received: (qmail 56033 invoked by uid 500); 29 Oct 2015 15:06:12 -0000 Delivered-To: apmail-yetus-commits-archive@yetus.apache.org Received: (qmail 56015 invoked by uid 500); 29 Oct 2015 15:06:12 -0000 Mailing-List: contact commits-help@yetus.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@yetus.apache.org Delivered-To: mailing list commits@yetus.apache.org Received: (qmail 56006 invoked by uid 99); 29 Oct 2015 15:06:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Oct 2015 15:06:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 90780E3921; Thu, 29 Oct 2015 15:06:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aw@apache.org To: commits@yetus.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: yetus git commit: YETUS-132. javadoc test does not run if javac test is disabled Date: Thu, 29 Oct 2015 15:06:12 +0000 (UTC) Repository: yetus Updated Branches: refs/heads/master 417c3564a -> 7c1face92 YETUS-132. javadoc test does not run if javac test is disabled Signed-off-by: Allen Wittenauer Project: http://git-wip-us.apache.org/repos/asf/yetus/repo Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/7c1face9 Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/7c1face9 Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/7c1face9 Branch: refs/heads/master Commit: 7c1face92ba9ba4aa36d981f0258cbf03b4837cd Parents: 417c356 Author: Kengo Seki Authored: Thu Oct 29 23:58:50 2015 +0900 Committer: Allen Wittenauer Committed: Thu Oct 29 08:05:42 2015 -0700 ---------------------------------------------------------------------- precommit/test-patch.d/java.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/yetus/blob/7c1face9/precommit/test-patch.d/java.sh ---------------------------------------------------------------------- diff --git a/precommit/test-patch.d/java.sh b/precommit/test-patch.d/java.sh index e1a73c7..49a220f 100755 --- a/precommit/test-patch.d/java.sh +++ b/precommit/test-patch.d/java.sh @@ -17,12 +17,20 @@ add_test_type javac add_test_type javadoc -function javac_initialize +JAVA_INITIALIZED=false + +function initialize_java { local i local jdkdir local tmplist + if [[ ${JAVA_INITIALIZED} == true ]]; then + return + else + JAVA_INITIALIZED=true + fi + # if we are in pre-docker mode, don't do any of # this work since it's all going to be wrong anyway if [[ "${DOCKERSUPPORT}" = "true" ]]; then @@ -67,6 +75,16 @@ function javac_initialize JDK_DIR_LIST=${JDK_DIR_LIST/ } } +function javac_initialize +{ + initialize_java +} + +function javadoc_initialize +{ + initialize_java +} + ## @description Verify that ${JAVA_HOME} is defined ## @audience public ## @stability stable