diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-02-17 15:50:38 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-02-17 15:51:49 +0100 |
| commit | 28137a5177de7823351b7d61149a6c194c46bb54 (patch) | |
| tree | 302418427d485bf3195a65b9ebc4555798bbd3d0 /solenv/gbuild/JunitTest.mk | |
| parent | a3aa7ada194c33a9bedd2b5ce0506b1c5f3604a6 (diff) | |
Various fixes for JunitTests
Diffstat (limited to 'solenv/gbuild/JunitTest.mk')
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 5cef3a43238e..19b5e09c85ea 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -52,7 +52,6 @@ $(call gb_JunitTest_get_target,%) : org.junit.runner.JUnitCore \ $(CLASSES) > $@.log 2>&1 || \ (grep -v -e 'at org.junit.' \ - -e 'at com.sun.star.lib.uno.' \ -e 'at java.lang.reflect.' \ -e 'at sun.reflect.' $@.log \ && echo "see full error log at $@.log" \ @@ -69,7 +68,7 @@ $(call gb_JunitTest_get_target,%) : $(CLEAN_CMD) define gb_JunitTest_JunitTest -$(call gb_JunitTest_get_target,$(1)) : T_CP := $(value XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib +$(call gb_JunitTest_get_target,$(1)) : T_CP := $(if $(value XCLASSPATH),$(value XCLASSPATH)$(gb_CLASSPATHSEP))$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib $(call gb_JunitTest_get_target,$(1)) : CLASSES := $(call gb_JunitTest_JunitTest_platform,$(1)) @@ -118,6 +117,13 @@ $(foreach jar,$(2),$(call gb_JunitTest_add_jar,$(1),$(jar))) endef +# see gb_JavaClassSet_add_jar_classset +define gb_JunitTest_add_jar_classset +$(call gb_JavaClassSet_add_jar_classset,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) +$(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(2))) + +endef + define gb_JunitTest_add_package_dependency $(call gb_JavaClassSet_add_package_dependency,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) |