From 2b2dfb8124013b133d6751417463f01dd225860b Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Mon, 17 Jun 2013 10:30:21 -0400
Subject: [PATCH] Cleaned up datamodel regression tests a bit more. Removed all
precond targets
---
bindings/java/build-unix.xml | 4 ++--
bindings/java/build-windows.xml | 4 ++--
bindings/java/build.xml | 11 +----------
3 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/bindings/java/build-unix.xml b/bindings/java/build-unix.xml
index bdec8aaa7..52e8df9ca 100644
--- a/bindings/java/build-unix.xml
+++ b/bindings/java/build-unix.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="windows-1252"?>
<project name="TSKTestTargets">
- <target name="test-precond"
+ <target name="test"
description="Performs regression tests."
depends="compile-test, copyTSKLibs">
<junit fork="on" haltonfailure="yes" dir=".">
@@ -13,7 +13,7 @@
</junit>
</target>
- <target name="test-rebuild-precond"
+ <target name="test-rebuild"
description="Rebuilds regression tests."
depends="compile-test, copyTSKLibs">
<java classname="org.sleuthkit.datamodel.DataModelTestSuite" classpathref="libraries" fork="true" failonerror="true">
diff --git a/bindings/java/build-windows.xml b/bindings/java/build-windows.xml
index 1f5ad4675..f39120063 100644
--- a/bindings/java/build-windows.xml
+++ b/bindings/java/build-windows.xml
@@ -7,7 +7,7 @@
</condition>
<property name="dlls" value="${env.LIBEWF_HOME}/msvscpp/zlib;${env.LIBEWF_HOME}/msvscpp/Release;../../win32/Release"/>
- <target name="test-precond"
+ <target name="test"
description="Runs the regression tests."
depends="compile-test" >
<fail unless="ewfFound" message="LIBEWF_HOME must be set as an environment variable."/>
@@ -22,7 +22,7 @@
</junit>
</target>
- <target name="test-rebuild-precond"
+ <target name="test-rebuild"
description="Rebuilds gold standards for tests."
depends="compile-test" >
<fail unless="ewfFound" message="LIBEWF_HOME must be set as an environment variable."/>
diff --git a/bindings/java/build.xml b/bindings/java/build.xml
index c1315e072..2cf136236 100755
--- a/bindings/java/build.xml
+++ b/bindings/java/build.xml
@@ -121,14 +121,5 @@ pattern="lib/[artifact]-[revision](-[classifier]).[ext]" />
<bunzip2 src="${test-input}/dfr-16-ext.dd.bz2" /> -->
</target>
- <!-- all of the work is done in test-precond -->
- <target name="test"
- description="Runs set of regression tests."
- depends="compile-test, test-precond">
- </target>
-
- <target name="test-rebuild"
- description="Rebuilds gold standards."
- depends="compile-test, test-rebuild-precond">
- </target>
+ <!-- NOTE: test and test-rebuild targets are in the OS-specific files -->
</project>
--
GitLab