diff options
author | David Tardon <dtardon@redhat.com> | 2011-04-06 12:47:49 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2011-04-06 12:47:49 +0200 |
commit | 9da441f0c4375dba0db2237a87845527361c318d (patch) | |
tree | d15ffafecbc8c0434a36d4baf9f8ca526a74259d | |
parent | 0d75184488923ddd76ccebcc3c09e85283496e17 (diff) |
remove duplicate code
This was introduced by commit 3726b1a63e0783953fee9c65d8c0cee3fd6cf85b .
-rw-r--r-- | solenv/gbuild/JunitTest.mk | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index e01297a093dd..bbbddcf3c733 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -101,70 +101,6 @@ define gb_JunitTest_add_jars $(foreach jar,$(2),$(call gb_JunitTest_add_jar,$(1),$(jar))) endef -.PHONY : $(call gb_JunitTest_get_clean_target,%) -$(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(call gb_JunitTest_get_classsetname,%)) - $(call gb_Helper_abbreviate_dirs,\ - rm -f $@ $@.log) - -.PHONY : $(call gb_JunitTest_get_target,$(1)) -$(call gb_JunitTest_get_target,%) : - $(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)" $(if $(strip $(gb_JunitTest_HEADLESS)),-Dorg.openoffice.test.arg.headless=$(gb_JunitTest_HEADLESS)) $(DEFS) org.junit.runner.JUnitCore $(CLASSES) 2>&1 > $@.log || (cat $@.log && false)) - $(CLEAN_CMD) - -define gb_JunitTest_JunitTest -$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(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)) - -$(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))) -$(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1)))) -endef - -define gb_JunitTest_set_defs -$(call gb_JunitTest_get_target,$(1)) : DEFS := $(2) - -endef - -define gb_JunitTest_add_classes -$(call gb_JunitTest_get_target,$(1)) : CLASSES += $(2) - -endef - -define gb_JunitTest_add_class -$(call gb_JunitTest_add_classes,$(1),$(2)) - -endef - - -define gb_JunitTest_add_sourcefile -$(call gb_JavaClassSet_add_sourcefile,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) - -endef - -define gb_JunitTest_add_sourcefiles -$(foreach sourcefile,$(2),$(call gb_JunitTest_add_sourcefile,$(1),$(sourcefile))) - -endef - -define gb_JunitTest_set_classpath -$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(2) - -endef - -define gb_JunitTest_add_jar -$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $$(CLASSPATH)$(gb_CLASSPATHSEP)$(2) -$(call gb_JunitTest_get_target,$(1)) : $(2) - -endef - -define gb_JunitTest_add_jars -$(foreach jar,$(2),$(call gb_JunitTest_add_jar,$(1),$(jar))) - -endef else # OOO_JUNIT_JAR |