From 18fb421fab73789a9b692f21a99d619b5dc5c9ff Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Wed, 18 Feb 2015 17:55:04 -0800 Subject: [PATCH] HADOOP-11440. Use "test.build.data" instead of "build.test.dir" for testing in ClientBaseWithFixes. Contributed by Kengo Seki. --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 92bd48d833..7a065d51f3 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -621,6 +621,9 @@ Release 2.7.0 - UNRELEASED HADOOP-11521. Make connection timeout configurable in s3a. (Thomas Demoor via stevel) + HADOOP-11440. Use "test.build.data" instead of "build.test.dir" for testing + in ClientBaseWithFixes. (Kengo Seki via aajisaka) + OPTIMIZATIONS HADOOP-11323. WritableComparator#compare keeps reference to byte array. diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java index 11d46574b2..7d0727abd1 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java @@ -66,7 +66,7 @@ public abstract class ClientBaseWithFixes extends ZKTestCase { public static int CONNECTION_TIMEOUT = 30000; static final File BASETEST = - new File(System.getProperty("build.test.dir", "build")); + new File(System.getProperty("test.build.data", "build")); protected final String hostPort = initHostPort(); protected int maxCnxns = 0;