Skip to content

C
core
Kaydet (Commit) 57d28ffd authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

sb140: #i117080# solenv/gbuilt/JunitTest.mk fails to remove the userdir

üst 2d5dd9a9
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
solenv/gbuild/JunitTest.mk
Dosyayı görüntüle @ 57d28ffd
...@@ -47,6 +47,7 @@ ifneq (,$(strip $(OOO_JUNIT_JAR))) ...@@ -47,6 +47,7 @@ ifneq (,$(strip $(OOO_JUNIT_JAR)))
$(call gb_JunitTest_get_target,%) : $(call gb_JunitTest_get_target,%) :
$(call gb_Output_announce,$*,$(true),JUT,2) $(call gb_Output_announce,$*,$(true),JUT,2)
$(call gb_Helper_abbreviate_dirs_native,\ $(call gb_Helper_abbreviate_dirs_native,\
rm -rf $(call gb_JunitTest_get_userdir,$*) && \
mkdir -p $(call gb_JunitTest_get_userdir,$*) && \ mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
$(gb_JunitTest_JAVACOMMAND) \ $(gb_JunitTest_JAVACOMMAND) \
-cp "$(CLASSPATH)" \ -cp "$(CLASSPATH)" \
...@@ -56,7 +57,8 @@ $(call gb_JunitTest_get_target,%) : ...@@ -56,7 +57,8 @@ $(call gb_JunitTest_get_target,%) :
'-Dorg.openoffice.test.arg.debugcommand=$(gb_JunitTest_DEBUGCOMMAND)') \ '-Dorg.openoffice.test.arg.debugcommand=$(gb_JunitTest_DEBUGCOMMAND)') \
$(DEFS) \ $(DEFS) \
org.junit.runner.JUnitCore \ 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) $(CLEAN_CMD)
define gb_JunitTest_JunitTest define gb_JunitTest_JunitTest
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment