diff --git a/bindings/java/build-unix.xml b/bindings/java/build-unix.xml index 842bf731f389e3c852ef569afe125c7fdd125555..45a15b8c39133504ce792c33acd1a60a7caf484a 100644 --- a/bindings/java/build-unix.xml +++ b/bindings/java/build-unix.xml @@ -2,8 +2,7 @@ <project name="TSKTestTargets"> <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." - depends="compile-test, depender" - if="pres"> + depends="compile-test, depender"> <junit fork="on" haltonfailure="yes" dir="."> <sysproperty key="rslt" value="${test-results}"/> <sysproperty key="gold" value="${test-standards}"/> @@ -12,20 +11,18 @@ <formatter type="plain" usefile="false" /> <test name="org.sleuthkit.datamodel.DataModelTestSuite" /> </junit> - <property name="imp" value="true"/> </target> <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." - depends="compile-test, depender" - if="pres"> + depends="compile-test, depender"> <java classname="org.sleuthkit.datamodel.DataModelTestSuite" classpathref="libraries" fork="true" failonerror="true"> <sysproperty key="gold" value="${test-standards}"/> <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"/> + <fail unless="pres" message="Run make install on The Sleuthkit."/> </target> </project> \ No newline at end of file diff --git a/bindings/java/build-windows.xml b/bindings/java/build-windows.xml index 6c45e5ac3589b63225c5ce41d6f6f46f5af94931..b2d7d2257b9a28b6d0fafb6a9c157df1769fceaa 100644 --- a/bindings/java/build-windows.xml +++ b/bindings/java/build-windows.xml @@ -19,7 +19,6 @@ <formatter type="plain" usefile="false" /> <test name="org.sleuthkit.datamodel.DataModelTestSuite" /> </junit> - <property name="imp" value="true"/> </target> <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." @@ -31,6 +30,5 @@ <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 1787cae231f723208bcfd0375e4ca7f93881d278..f80a1e54c7d6437bf368bec8c6dd0b9ac30bc3ff 100755 --- a/bindings/java/build.xml +++ b/bindings/java/build.xml @@ -125,8 +125,6 @@ pattern="lib/[artifact]-[revision](-[classifier]).[ext]" /> </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-standards-precond" - unless="imp"> - <fail message="Run make install on The Sleuthkit."/> + depends="compile-test, test-create-standards-precond"> </target> </project>