From 21de41187d2dc88341026e4ff63433891648266e Mon Sep 17 00:00:00 2001
From: millmanorama <millmanorama@gmail.com>
Date: Thu, 14 Feb 2019 14:46:00 +0100
Subject: [PATCH] run the timeline tests as part of the regression tests
---
bindings/java/build-unix.xml | 1 +
bindings/java/build-windows.xml | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/bindings/java/build-unix.xml b/bindings/java/build-unix.xml
index 84d2c84ad..7caebd577 100644
--- a/bindings/java/build-unix.xml
+++ b/bindings/java/build-unix.xml
@@ -11,6 +11,7 @@
<sysproperty key="inpt" value="${test-input}"/>
<classpath refid="libraries"/>
<formatter type="plain" usefile="false"/>
+ <test name="org.sleuthkit.datamodel.timeline.TimelineTestSuite" />
<test name="org.sleuthkit.datamodel.DataModelTestSuite"/>
</junit>
</target>
diff --git a/bindings/java/build-windows.xml b/bindings/java/build-windows.xml
index e65df5537..de4ead0d3 100644
--- a/bindings/java/build-windows.xml
+++ b/bindings/java/build-windows.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="windows-1252"?>
<project name="TSKTestTargets">
- <property name="dlls" value="../../win32/x64/Release_PostgreSQL"/>
- <property environment="env"/>
+ <property name="dlls" value="../../win32/x64/Release_PostgreSQL"/>
+ <property environment="env"/>
<target name="test"
description="Runs the regression tests."
@@ -14,6 +14,7 @@
<sysproperty key="inpt" value="${test-input}"/>
<classpath refid="libraries" />
<formatter type="plain" usefile="false" />
+ <test name="org.sleuthkit.datamodel.timeline.TimelineTestSuite" />
<test name="org.sleuthkit.datamodel.DataModelTestSuite" />
</junit>
</target>
@@ -33,12 +34,12 @@
<target name="check-build-32" if="win32.TskLib.exists">
<uptodate property="native-up-to-date" srcfile="${basedir}/../../win32/Release/libtsk_jni.dll"
- targetfile="${x86}/win/libtsk_jni.dll"/>
+ targetfile="${x86}/win/libtsk_jni.dll"/>
</target>
<target name="check-build-64" if="win64.TskLib.exists">
<uptodate property="native-up-to-date" srcfile="${basedir}/../../win32/x64/Release/libtsk_jni.dll"
- targetfile="${amd64}/win/libtsk_jni.dll"/>
+ targetfile="${amd64}/win/libtsk_jni.dll"/>
</target>
<target name="copyLibs-SQLite" description="Copy native libs to the correct folder">
--
GitLab