summaryrefslogtreecommitdiff
path: root/solenv/gbuild/JunitTest.mk
diff options
context:
space:
mode:
Diffstat (limited to 'solenv/gbuild/JunitTest.mk')
-rw-r--r--solenv/gbuild/JunitTest.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 6df4246ebf8c..a93576cff168 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -47,8 +47,9 @@ ifneq (,$(strip $(OOO_JUNIT_JAR)))
$(call gb_JunitTest_get_target,%) :
$(call gb_Output_announce,$*,$(true),JUT,2)
$(call gb_Helper_abbreviate_dirs_native,\
+ rm -rf $(call gb_JunitTest_get_userdir,$*) && \
mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
- $(gb_JunitTest_JAVACOMMAND) \
+ ($(gb_JunitTest_JAVACOMMAND) \
-cp "$(CLASSPATH)" \
$(if $(strip $(gb_JunitTest_HEADLESS)),\
-Dorg.openoffice.test.arg.headless=$(gb_JunitTest_HEADLESS)) \
@@ -56,7 +57,8 @@ $(call gb_JunitTest_get_target,%) :
'-Dorg.openoffice.test.arg.debugcommand=$(gb_JunitTest_DEBUGCOMMAND)') \
$(DEFS) \
org.junit.runner.JUnitCore \
- $(CLASSES) 2>&1 > $@.log || (cat $@.log && false))
+ $(CLASSES) 2>&1 > $@.log || (cat $@.log && false)) && \
+ rm -rf $(call gb_JunitTest_get_userdir,$*))
$(CLEAN_CMD)
define gb_JunitTest_JunitTest