hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: HBASE-14588 Stop accessing test resources from within src folder (Andrew Wang)
Date Tue, 13 Oct 2015 06:11:36 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 c285bcd2d -> e78a7e080


HBASE-14588 Stop accessing test resources from within src folder (Andrew Wang)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e78a7e08
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e78a7e08
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e78a7e08

Branch: refs/heads/branch-1.2
Commit: e78a7e0806370b03413b29ac24ea81d534067bbc
Parents: c285bcd
Author: stack <stack@apache.org>
Authored: Mon Oct 12 23:10:06 2015 -0700
Committer: stack <stack@apache.org>
Committed: Mon Oct 12 23:11:29 2015 -0700

----------------------------------------------------------------------
 hbase-server/src/test/data/0000000000000016310  | Bin 11776703 -> 0 bytes
 ...85428f5cb61.21e75333ada3d5bafb34bb918f29576c | Bin 24 -> 0 bytes
 .../apache/hadoop/hbase/io/TestReference.java   |   4 ++--
 .../hbase/regionserver/TestRecoveredEdits.java  |   6 +++---
 .../src/test/resources/0000000000000016310      | Bin 0 -> 11776703 bytes
 ...85428f5cb61.21e75333ada3d5bafb34bb918f29576c | Bin 0 -> 24 bytes
 pom.xml                                         |   3 +++
 7 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/e78a7e08/hbase-server/src/test/data/0000000000000016310
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/data/0000000000000016310 b/hbase-server/src/test/data/0000000000000016310
deleted file mode 100644
index 8e58c98..0000000
Binary files a/hbase-server/src/test/data/0000000000000016310 and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/e78a7e08/hbase-server/src/test/data/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/data/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c
b/hbase-server/src/test/data/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c
deleted file mode 100644
index d16afff..0000000
Binary files a/hbase-server/src/test/data/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c
and /dev/null differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/e78a7e08/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestReference.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestReference.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestReference.java
index 62fec53..eaeb601 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestReference.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestReference.java
@@ -42,8 +42,8 @@ public class TestReference {
   @Test
   public void testParsingWritableReference() throws IOException {
     // Read a Reference written w/ 0.94 out of the test data dir.
-    final String datafile = System.getProperty("project.build.testSourceDirectory", "src/test")
+
-      File.separator + "data" + File.separator +
+    final String datafile = System.getProperty("test.build.classes",
+        "target/test-classes") + File.separator +
       "a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c";
     FileSystem fs = FileSystem.get(HTU.getConfiguration());
     Reference.read(fs, new Path(datafile));

http://git-wip-us.apache.org/repos/asf/hbase/blob/e78a7e08/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRecoveredEdits.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRecoveredEdits.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRecoveredEdits.java
index d363701..bf72301 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRecoveredEdits.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRecoveredEdits.java
@@ -115,9 +115,9 @@ public class TestRecoveredEdits {
     Path regionDir = region.getRegionDir(hbaseRootDir, hri);
     Path recoveredEditsDir = WALSplitter.getRegionDirRecoveredEditsDir(regionDir);
     // This is a little fragile getting this path to a file of 10M of edits.
-    Path recoveredEditsFile = new Path(new Path(
-      System.getProperty("project.build.testSourceDirectory", "src" + Path.SEPARATOR + "test"),
-      "data"), "0000000000000016310");
+    Path recoveredEditsFile = new Path(
+      System.getProperty("test.build.classes", "target/test-classes"),
+        "0000000000000016310");
     // Copy this file under the region's recovered.edits dir so it is replayed on reopen.
     Path destination = new Path(recoveredEditsDir, recoveredEditsFile.getName());
     fs.copyToLocalFile(recoveredEditsFile, destination);

http://git-wip-us.apache.org/repos/asf/hbase/blob/e78a7e08/hbase-server/src/test/resources/0000000000000016310
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/resources/0000000000000016310 b/hbase-server/src/test/resources/0000000000000016310
new file mode 100644
index 0000000..8e58c98
Binary files /dev/null and b/hbase-server/src/test/resources/0000000000000016310 differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/e78a7e08/hbase-server/src/test/resources/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/resources/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c
b/hbase-server/src/test/resources/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c
new file mode 100644
index 0000000..d16afff
Binary files /dev/null and b/hbase-server/src/test/resources/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c
differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/e78a7e08/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7f9dfcb..c7faaf4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -520,6 +520,7 @@
             <redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
             <systemPropertyVariables>
               <jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
+              <test.build.classes>${test.build.classes}</test.build.classes>
             </systemPropertyVariables>
 
             <excludes>
@@ -1250,6 +1251,8 @@
     <hbase.skip-jacoco>true</hbase.skip-jacoco>
     <jacoco.version>0.7.5.201505241946</jacoco.version>
     <extra.enforcer.version>1.0-beta-3</extra.enforcer.version>
+    <!-- Location of test resources -->
+    <test.build.classes>${project.build.directory}/test-classes</test.build.classes>
   </properties>
   <!-- Sorted by groups of dependencies then groupId and artifactId -->
   <dependencyManagement>


Mime
View raw message