summaryrefslogtreecommitdiff
path: root/solenv/gbuild
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2011-03-25 12:41:11 +0100
committerVladimir Glazunov <vg@openoffice.org>2011-03-25 12:41:11 +0100
commitf2277b6211713d20bb488415ed1e61e86d81b04a (patch)
tree8bab1140d454bb44a796cac0b8d300af6a1c7cd4 /solenv/gbuild
parent7ee057d408b05a1fadaa344abfc2d5d0945e3a24 (diff)
#i117080# fix for removal of the userdir
Diffstat (limited to 'solenv/gbuild')
-rw-r--r--solenv/gbuild/JunitTest.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 5699398241ca..4b6fe5e7fc56 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -43,8 +43,10 @@ $(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_targe
$(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) -cp "$(CLASSPATH)" $(DEFS) org.junit.runner.JUnitCore $(CLASSES) 2>&1 > $@.log || (cat $@.log && false))
+ $(gb_JunitTest_JAVACOMMAND) -cp "$(CLASSPATH)" $(DEFS) org.junit.runner.JUnitCore $(CLASSES) 2>&1 > $@.log || (cat $@.log && false) && \
+ rm -rf $(call gb_JunitTest_get_userdir,$*))
$(CLEAN_CMD)
define gb_JunitTest_JunitTest