From 595a880dbf8e74e629f057bf00b7a2a9be3f614a Mon Sep 17 00:00:00 2001
From: smoss <smoss@mbp-osx-brianc.local>
Date: Thu, 7 Feb 2013 18:14:21 -0500
Subject: [PATCH] modified: bindings/java/build-unix.xml
modified: bindings/java/build-windows.xml modified:
bindings/java/build.xml modified:
bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java
---
bindings/java/build-unix.xml | 2 ++
bindings/java/build-windows.xml | 2 ++
bindings/java/build.xml | 8 +++++---
.../test/org/sleuthkit/datamodel/DataModelTestSuite.java | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/bindings/java/build-unix.xml b/bindings/java/build-unix.xml
index 1a916b968..84748bc7f 100644
--- a/bindings/java/build-unix.xml
+++ b/bindings/java/build-unix.xml
@@ -13,6 +13,7 @@
<formatter type="plain" usefile="false" />
<test name="org.sleuthkit.datamodel.DataModelTestSuite" />
</junit>
+ <property name="imp" value="true"/>
</target>
<target name="test-create-standards1"
description="Traverses the Images stored in the path represented by test-input variable and creates then stores them to the path represented by the test-standards variable, run test-download-imgs at least once before this."
@@ -24,6 +25,7 @@
<sysproperty key="inpt" value="${test-input}"/>
<sysproperty key="types" value="${test-types}"/>
</java>
+ <property name="imp" value="true"/>
</target>
<target name="depender">
<available file="/usr/local/lib/libtsk_jni.a" property="pres"/>
diff --git a/bindings/java/build-windows.xml b/bindings/java/build-windows.xml
index 66b219dad..9aa92e7b6 100644
--- a/bindings/java/build-windows.xml
+++ b/bindings/java/build-windows.xml
@@ -14,6 +14,7 @@
<formatter type="plain" usefile="false" />
<test name="org.sleuthkit.datamodel.DataModelTestSuite" />
</junit>
+ <property name="imp" value="true"/>
</target>
<target name="test-create-standards1"
description="Traverses the Images stored in the path represented by test-input variable and creates then stores them to the path represented by the test-standards variable, run test-download-imgs at least once before this."
@@ -25,5 +26,6 @@
<sysproperty key="inpt" value="${test-input}"/>
<sysproperty key="types" value="${test-types}"/>
</java>
+ <property name="imp" value="true"/>
</target>
</project>
diff --git a/bindings/java/build.xml b/bindings/java/build.xml
index f22a31ec0..ef9ad39a0 100755
--- a/bindings/java/build.xml
+++ b/bindings/java/build.xml
@@ -131,12 +131,14 @@ pattern="lib/[artifact]-[revision](-[classifier]).[ext]" />
<get src="http://digitalcorpora.org/corp/nps/drives/nps-2009-canon2/nps-2009-canon2-gen5.raw" dest="${test-input}"/>
<get src="http://digitalcorpora.org/corp/nps/drives/nps-2009-ntfs1/ntfs1-gen2.raw" dest="${test-input}"/>
</target>
- <target name="test"
+ <target name="test"
description="Traverses the Images stored in the path represented by test-input variable, creates results files stored in the path represented by test-results, and compares them to the standards stored in the path represented by the test-standards variable, always run test-create-standards at least once before before running test."
- depends="compile-test, test1" >
+ depends="compile-test, test1">
</target>
<target name="test-create-standards"
description="Traverses the Images stored in the path represented by test-input variable and creates then stores them to the path represented by the test-standards variable, run test-download-imgs at least once before this."
- depends="compile-test, test-create-standards1" >
+ depends="compile-test, test-create-standards1"
+ unless="imp">
+ <echo message="Run make install on The Sleuthkit"/>
</target>
</project>
diff --git a/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java b/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java
index 136557d58..f0957295e 100644
--- a/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java
+++ b/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java
@@ -187,7 +187,7 @@ public boolean accept(java.io.File f) {
* @param standardPath The path to the file to put the tsk data in
* @param img the path to the image, is a list for compatability reasons
*/
- private static void getTSKData(String standardPath, List<String> img) {
+ private static void getTSKData(String standardPath, List<String> img) {
String tsk_loc;
java.io.File up = new java.io.File(System.getProperty("user.dir"));
up = up.getParentFile();
--
GitLab