From a0249850e1987eca92d6ed970cfb5eaa42bb0c95 Mon Sep 17 00:00:00 2001
From: "U-BASIS\\zhaohui" <zhaohui@win-zhaoh-3257.basistech.net>
Date: Wed, 10 Jan 2018 15:06:39 -0500
Subject: [PATCH] 3189: add libraries to the path env for junit test
---
bindings/java/build-unix.xml | 4 ++++
bindings/java/build-windows.xml | 7 ++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/bindings/java/build-unix.xml b/bindings/java/build-unix.xml
index 962bd0731..d7e80acd9 100644
--- a/bindings/java/build-unix.xml
+++ b/bindings/java/build-unix.xml
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="windows-1252"?>
<project name="TSKTestTargets">
+ <property name="dlls" value="../../win32/x64/Release_PostgreSQL"/>
+ <property environment="env"/>
+
<target name="test"
description="Performs regression tests."
depends="compile-test, copyTSKLibs">
<junit fork="on" haltonfailure="yes" dir=".">
+ <env key="path" value="${env.Path}:${dlls}"/>
<sysproperty key="rslt" value="${test-results}"/>
<sysproperty key="gold" value="${test-standards}"/>
<sysproperty key="inpt" value="${test-input}"/>
diff --git a/bindings/java/build-windows.xml b/bindings/java/build-windows.xml
index dcc395f5d..bb3b2c72e 100644
--- a/bindings/java/build-windows.xml
+++ b/bindings/java/build-windows.xml
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="windows-1252"?>
<project name="TSKTestTargets">
- <property name="dlls" value="../../win32/Release"/>
-
+ <property name="dlls" value="../../win32/x64/Release_PostgreSQL"/>
+ <property environment="env"/>
+
<target name="test"
description="Runs the regression tests."
depends="compile-test" >
<junit fork="on" haltonfailure="yes" dir=".">
- <sysproperty key="java.library.path" value="${dlls}"/>
+ <env key="path" value="${env.Path};${dlls}"/>
<sysproperty key="rslt" value="${test-results}"/>
<sysproperty key="gold" value="${test-standards}"/>
<sysproperty key="inpt" value="${test-input}"/>
--
GitLab