From dc0d82429288a194423782e33a2612c1784448eb Mon Sep 17 00:00:00 2001
From: smoss <smoss@mbp-osx-brianc.local>
Date: Thu, 7 Feb 2013 16:22:28 -0500
Subject: [PATCH] modified: bindings/java/build.xml modified:
bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java
---
bindings/java/build.xml | 2 +-
.../sleuthkit/datamodel/DataModelTestSuite.java | 14 +++++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/bindings/java/build.xml b/bindings/java/build.xml
index c29538388..ab734db3d 100755
--- a/bindings/java/build.xml
+++ b/bindings/java/build.xml
@@ -23,7 +23,7 @@
<property name="test-results" location="test/output/results"/>
<property name="test-input" location="test/input"/>
<property name="test-types" location="test/org/sleuthkit/datamodel"/>
- <condition property="dlls" value="jni/.libs">
+ <condition property="dlls" value=".:/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java">
<os family="unix"/>
</condition>
<condition property="dlls" value="${env.LIBEWF_HOME}/msvscpp/zlib;${env.LIBEWF_HOME}/msvscpp/Release;../../win32/Release">
diff --git a/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java b/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java
index 7a67c0300..136557d58 100644
--- a/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java
+++ b/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java
@@ -411,6 +411,19 @@ protected static String getFsCData(FsContent fi) throws TskCoreException {
* @param args Ignored
*/
public static void main(String[] args) {
+ if(System.getProperty("os.name").contains("Mac")||System.getProperty("os.name").toLowerCase().contains("unix")){
+ java.io.File dep = new java.io.File("/usr/local/lib");
+ boolean deps = false;
+ for(String chk: dep.list())
+ {
+ deps = (deps||chk.toLowerCase().contains("tsk"));
+ }
+ if(!deps)
+ {
+ System.out.println("Run make install on tsk");
+ throw new RuntimeException("Run make install on tsk");
+ }
+ }
String tempDirPath = System.getProperty("java.io.tmpdir");
tempDirPath = tempDirPath.substring(0, tempDirPath.length() - 1);
java.io.File pth = new java.io.File(DataModelTestSuite.goldStandardPath());
@@ -429,7 +442,6 @@ public boolean accept(java.io.File f) {
for (ImgTraverser tstrn : tests) {
String standardPath = DataModelTestSuite.standardPath(paths, tstrn.getClass().getSimpleName());
System.out.println("Creating " + tstrn.getClass().getSimpleName() + " standard for: " + paths.get(0));
- System.out.println(System.getProperty("java.library.path"));
DataModelTestSuite.createStandard(standardPath, tempDirPath, paths, tstrn);
}
String standardPathCPP = DataModelTestSuite.standardPath(paths, CPPtoJavaCompare.class.getSimpleName());
--
GitLab