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 22:37:18 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.98 c6608e652 -> 80b40e3da


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/80b40e3d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/80b40e3d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/80b40e3d

Branch: refs/heads/0.98
Commit: 80b40e3daf6414c946bf4ea7acae61159ea32775
Parents: c6608e6
Author: stack <stack@apache.org>
Authored: Mon Oct 12 23:10:06 2015 -0700
Committer: stack <stack@apache.org>
Committed: Tue Oct 13 15:37:09 2015 -0700

----------------------------------------------------------------------
 ...d9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c | Bin 24 -> 0 bytes
 .../org/apache/hadoop/hbase/io/TestReference.java     |   4 ++--
 ...d9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c | Bin 0 -> 24 bytes
 pom.xml                                               |   3 +++
 4 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/80b40e3d/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/80b40e3d/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/80b40e3d/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/80b40e3d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 349b268..5d1f46d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -502,6 +502,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>
@@ -1179,6 +1180,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