Skip to content
Snippets Groups Projects
Commit 26e555cf authored by Sean-M's avatar Sean-M
Browse files

Even More minor fixes to build

parent 7be73d67
No related branches found
No related tags found
No related merge requests found
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
<project name="TSKTestTargets"> <project name="TSKTestTargets">
<target name="test-precond" <target name="test-precond"
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." 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, depender" depends="compile-test, depender">
if="pres">
<junit fork="on" haltonfailure="yes" dir="."> <junit fork="on" haltonfailure="yes" dir=".">
<sysproperty key="rslt" value="${test-results}"/> <sysproperty key="rslt" value="${test-results}"/>
<sysproperty key="gold" value="${test-standards}"/> <sysproperty key="gold" value="${test-standards}"/>
...@@ -12,20 +11,18 @@ ...@@ -12,20 +11,18 @@
<formatter type="plain" usefile="false" /> <formatter type="plain" usefile="false" />
<test name="org.sleuthkit.datamodel.DataModelTestSuite" /> <test name="org.sleuthkit.datamodel.DataModelTestSuite" />
</junit> </junit>
<property name="imp" value="true"/>
</target> </target>
<target name="test-create-standards-precond" <target name="test-create-standards-precond"
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." 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, depender" depends="compile-test, depender">
if="pres">
<java classname="org.sleuthkit.datamodel.DataModelTestSuite" classpathref="libraries" fork="true" failonerror="true"> <java classname="org.sleuthkit.datamodel.DataModelTestSuite" classpathref="libraries" fork="true" failonerror="true">
<sysproperty key="gold" value="${test-standards}"/> <sysproperty key="gold" value="${test-standards}"/>
<sysproperty key="inpt" value="${test-input}"/> <sysproperty key="inpt" value="${test-input}"/>
<sysproperty key="types" value="${test-types}"/> <sysproperty key="types" value="${test-types}"/>
</java> </java>
<property name="imp" value="true"/>
</target> </target>
<target name="depender"> <target name="depender">
<available file="/usr/local/lib/libtsk_jni.a" property="pres"/> <available file="/usr/local/lib/libtsk_jni.a" property="pres"/>
<fail unless="pres" message="Run make install on The Sleuthkit."/>
</target> </target>
</project> </project>
\ No newline at end of file
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
<formatter type="plain" usefile="false" /> <formatter type="plain" usefile="false" />
<test name="org.sleuthkit.datamodel.DataModelTestSuite" /> <test name="org.sleuthkit.datamodel.DataModelTestSuite" />
</junit> </junit>
<property name="imp" value="true"/>
</target> </target>
<target name="test-create-standards-precond" <target name="test-create-standards-precond"
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." 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."
...@@ -31,6 +30,5 @@ ...@@ -31,6 +30,5 @@
<sysproperty key="inpt" value="${test-input}"/> <sysproperty key="inpt" value="${test-input}"/>
<sysproperty key="types" value="${test-types}"/> <sysproperty key="types" value="${test-types}"/>
</java> </java>
<property name="imp" value="true"/>
</target> </target>
</project> </project>
...@@ -125,8 +125,6 @@ pattern="lib/[artifact]-[revision](-[classifier]).[ext]" /> ...@@ -125,8 +125,6 @@ pattern="lib/[artifact]-[revision](-[classifier]).[ext]" />
</target> </target>
<target name="test-create-standards" <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." 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-standards-precond" depends="compile-test, test-create-standards-precond">
unless="imp">
<fail message="Run make install on The Sleuthkit."/>
</target> </target>
</project> </project>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment