Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5E0CD18DA8 for ; Mon, 21 Mar 2016 20:14:27 +0000 (UTC) Received: (qmail 40411 invoked by uid 500); 21 Mar 2016 20:14:17 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 37820 invoked by uid 500); 21 Mar 2016 20:14:16 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 36272 invoked by uid 99); 21 Mar 2016 20:14:15 -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; Mon, 21 Mar 2016 20:14:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1EC48DFC72; Mon, 21 Mar 2016 20:14:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wangda@apache.org To: common-commits@hadoop.apache.org Date: Mon, 21 Mar 2016 20:14:44 -0000 Message-Id: <12be09a46fe244c9b06decc97311c52b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [31/50] [abbrv] hadoop git commit: MAPREDUCE-6645. TestWordStats outputs logs under directories other than target/test-dir. Contributed by Gabor Liptak. MAPREDUCE-6645. TestWordStats outputs logs under directories other than target/test-dir. Contributed by Gabor Liptak. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/80fa70c4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/80fa70c4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/80fa70c4 Branch: refs/heads/YARN-3368 Commit: 80fa70c4e15f16b411cb3691df546499c6a19d4c Parents: 02a250d Author: Akira Ajisaka Authored: Thu Mar 17 18:08:31 2016 +0900 Committer: Akira Ajisaka Committed: Thu Mar 17 18:08:31 2016 +0900 ---------------------------------------------------------------------- .../org/apache/hadoop/examples/TestWordStats.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/80fa70c4/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/TestWordStats.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/TestWordStats.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/TestWordStats.java index 56b358e..3f0ffd6 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/TestWordStats.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/TestWordStats.java @@ -31,15 +31,18 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.util.ToolRunner; +import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; public class TestWordStats { private final static String INPUT = "src/test/java/org/apache/hadoop/examples/pi/math"; - private final static String MEAN_OUTPUT = "build/data/mean_output"; - private final static String MEDIAN_OUTPUT = "build/data/median_output"; - private final static String STDDEV_OUTPUT = "build/data/stddev_output"; + private final static String BASEDIR = System.getProperty("test.build.data", + "target/test-dir"); + private final static String MEAN_OUTPUT = BASEDIR + "/mean_output"; + private final static String MEDIAN_OUTPUT = BASEDIR + "/median_output"; + private final static String STDDEV_OUTPUT = BASEDIR + "/stddev_output"; /** * Modified internal test class that is designed to read all the files in the @@ -286,4 +289,10 @@ public class TestWordStats { assertEquals(stddev, wr.read(INPUT), 0.0); } + @AfterClass public static void cleanup() throws Exception { + deleteDir(new File(MEAN_OUTPUT)); + deleteDir(new File(MEDIAN_OUTPUT)); + deleteDir(new File(STDDEV_OUTPUT)); + } + }