summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qadevOOo/runner/helper/ClParser.java4
-rw-r--r--test/source/java/makefile.mk4
2 files changed, 7 insertions, 1 deletions
diff --git a/qadevOOo/runner/helper/ClParser.java b/qadevOOo/runner/helper/ClParser.java
index c88b14a6028b..f8d4aca4d82e 100644
--- a/qadevOOo/runner/helper/ClParser.java
+++ b/qadevOOo/runner/helper/ClParser.java
@@ -29,6 +29,7 @@
************************************************************************/
package helper;
+import java.io.File;
import java.util.Properties;
import lib.TestParameters;
@@ -97,7 +98,8 @@ public class ClParser
if (pName.equals("TestDocumentPath"))
{
- System.setProperty("DOCPTH", pValue);
+ System.setProperty(
+ "DOCPTH", new File(pValue).getAbsolutePath());
}
else if (pName.equals(PropertyName.SRC_ROOT))
{
diff --git a/test/source/java/makefile.mk b/test/source/java/makefile.mk
index 86072700a6f4..d6bb8e055d4a 100644
--- a/test/source/java/makefile.mk
+++ b/test/source/java/makefile.mk
@@ -27,6 +27,8 @@ PRJ = ../..
PRJNAME = test
TARGET = java
+.IF "$(OOO_JUNIT_JAR)" != ""
+
PACKAGE = org/openoffice/test
JAVAFILES = OfficeConnection.java
JARFILES = juh.jar ridl.jar unoil.jar
@@ -36,5 +38,7 @@ JARTARGET = test.jar
JARCLASSDIRS = $(PACKAGE)
JARCLASSPATH = $(JARFILES) $(EXTRAJARFILES)
+.END
+
.INCLUDE: settings.mk
.INCLUDE: target.mk