diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-11 21:16:21 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-11 21:16:21 +0100 |
| commit | 9ba809fac54cafd52094cf0d1ac4f2838eca567e (patch) | |
| tree | 1f3b04180542c5f01f487460b1365a6519499f83 /solenv/gbuild/JunitTest.mk | |
| parent | 28dda61de127077c18f04dc172fa7d824a2e6025 (diff) | |
gnumake3: more work on junit subsequenttest migration
Diffstat (limited to 'solenv/gbuild/JunitTest.mk')
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index fb3795a12b27..10330db516ca 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -33,22 +33,22 @@ gb_JunitTest_JAVACOMMAND := $(JAVAINTERPRETER) .PHONY : $(call gb_JunitTest_get_clean_target,%) $(call gb_JunitTest_get_clean_target,%) : $(call gb_LinkTarget_get_clean_target,$(call gb_Library_get_linktargetname,%)) $(call gb_Helper_abbreviate_dirs,\ - rm -f $@) + rm -f $@ $@.log) -.PHONY : $(call gb_JunitTest_get_target,%) +.PHONY : $(call gb_JunitTest_get_target,$(1)) $(call gb_JunitTest_get_target,%) : $(gb_JunitTest_JAVACOMMAND) $(call gb_Output_announce,$*,$(true),JUT,2) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(call gb_JunitTest_get_userdir,$*) && \ - $(gb_JunitTest_JAVACOMMAND) -cp "$(CLASSPATH)" $(DEFS) org.junit.runner.JUnitCore $(CLASSES)) + $(gb_JunitTest_JAVACOMMAND) -cp "$(CLASSPATH)" $(DEFS) org.junit.runner.JUnitCore $(CLASSES) 2>&1 > $@.log || (cat $@.log && false)) define gb_JunitTest_JunitTest -$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(value XCLASSPATH):$(OOO_JUNIT_JAR):$(OUTDIR)/bin/OOoRunner.jar:$(OUTDIR)/bin/ridl.jar:$(OUTDIR)/bin/test.jar:$(OUTDIR)/bin/unoil.jar:$(OUTDIR)/bin/jurt.jar:$(OUTDIR)/lib:$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1))) +$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(value XCLASSPATH):$(OOO_JUNIT_JAR):$(OUTDIR)/bin/OOoRunner.jar:$(OUTDIR)/bin/ridl.jar:$(OUTDIR)/bin/test.jar:$(OUTDIR)/bin/unoil.jar:$(OUTDIR)/bin/jurt.jar:$(OUTDIR)/lib:$(OUTDIR)/bin/ConnectivityTools.jar:$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1))) $(call gb_JunitTest_get_target,$(1)) : CLASSES := $(call gb_JunitTest_get_target,$(1)) : DEFS := \ -Dorg.openoffice.test.arg.soffice=path:$(OUTDIR)/installation/opt/openoffice.org3/program/soffice \ -Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \ - -Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$*) \ + -Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \ $(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1))) $(call gb_JunitTest_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_JunitTest_get_classsetname,$(1))) |