diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-09 11:35:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-09 17:46:36 +0200 |
| commit | 57d28ffd21e29d05084b16f8013eef7790403d72 (patch) | |
| tree | eefa4de06748ffd4f3b00df59e9976aee65e75a1 /solenv/gbuild/JunitTest.mk | |
| parent | sb140: sb140: #i116981# clean up memory upon exit (diff) | |
| download | core-57d28ffd21e29d05084b16f8013eef7790403d72.tar.gz core-57d28ffd21e29d05084b16f8013eef7790403d72.zip | |
sb140: #i117080# solenv/gbuilt/JunitTest.mk fails to remove the userdir
Diffstat (limited to 'solenv/gbuild/JunitTest.mk')
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 6df4246ebf8c..699f1a68f2a0 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -47,6 +47,7 @@ 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) \ -cp "$(CLASSPATH)" \ @@ -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 |