From bd2ec3392a707127ea0bf1a1b5d18ac408f8c09a Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Fri, 11 Mar 2011 14:30:09 +0100 Subject: Spaces -> tabs in gbuild, GNU make does not like spaces ;-) --- solenv/gbuild/JunitTest.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'solenv/gbuild/JunitTest.mk') diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index afc9486fd5a4..7334cdf4d5d4 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -32,16 +32,16 @@ gb_JunitTest_JAVACOMMAND := $(JAVAINTERPRETER) $(JAVAIFLAGS) .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) + $(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)" $(DEFS) org.junit.runner.JUnitCore $(CLASSES) 2>&1 > $@.log || (cat $@.log && false)) - $(CLEAN_CMD) + $(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) 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 @@ -94,4 +94,4 @@ define gb_JunitTest_add_jars $(foreach jar,$(2),$(call gb_JunitTest_add_jar,$(1),$(jar))) endef -# vim: set noet sw=4 ts=4: +# vim: set noet sw=4: -- cgit From 4a27caaed362f6788deb420f524dcb25288ecedf Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 29 Mar 2011 21:04:19 +0200 Subject: enable headless Junit tests and default to that --- solenv/gbuild/JunitTest.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'solenv/gbuild/JunitTest.mk') diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 5be81ab6ca20..e2c87e5f6c75 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -29,6 +29,7 @@ # JunitTest class gb_JunitTest_JAVACOMMAND := $(JAVAINTERPRETER) $(JAVAIFLAGS) +gb_JunitTest_HEADLESS := $(true) # in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell DBGSV_ERROR_OUT := shell @@ -44,7 +45,7 @@ $(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)" $(DEFS) org.junit.runner.JUnitCore $(CLASSES) 2>&1 > $@.log || (cat $@.log && false)) + $(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 -- cgit From a59e57ab2cd776593a0ea18b6e36b08857d9c3de Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 1 Apr 2011 13:49:12 +0200 Subject: skip Junit test, when no Junit available --- solenv/gbuild/JunitTest.mk | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) (limited to 'solenv/gbuild/JunitTest.mk') diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index e2c87e5f6c75..19841b24ffd6 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -40,6 +40,8 @@ $(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_targe $(call gb_Helper_abbreviate_dirs,\ rm -f $@ $@.log) +ifneq (,$(strip $(OOO_JUNIT_JAR))) + .PHONY : $(call gb_JunitTest_get_target,$(1)) $(call gb_JunitTest_get_target,%) : $(call gb_Output_announce,$*,$(true),JUT,2) @@ -99,4 +101,90 @@ 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 + +.PHONY : $(call gb_JunitTest_get_target,$(1)) +$(call gb_JunitTest_get_target,%) : + $(call gb_Output_announce,$* (skipped - no Junit),$(true),JUT,2) + @true + +define gb_JunitTest_JunitTest +$(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1)))) +endef + +gb_JunitTest_set_defs := +gb_JunitTest_add_classes := +gb_JunitTest_add_class := +gb_JunitTest_add_sourcefile := +gb_JunitTest_add_sourcefiles := +gb_JunitTest_set_classpath := +gb_JunitTest_add_jar := +gb_JunitTest_add_jars := + +endif # OOO_JUNIT_JAR # vim: set noet sw=4: -- cgit From 0d75184488923ddd76ccebcc3c09e85283496e17 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 6 Apr 2011 12:07:01 +0200 Subject: $(1) is not defined here --- solenv/gbuild/JunitTest.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv/gbuild/JunitTest.mk') diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 19841b24ffd6..e01297a093dd 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -42,7 +42,7 @@ $(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_targe ifneq (,$(strip $(OOO_JUNIT_JAR))) -.PHONY : $(call gb_JunitTest_get_target,$(1)) +.PHONY : $(call gb_JunitTest_get_target,%) $(call gb_JunitTest_get_target,%) : $(call gb_Output_announce,$*,$(true),JUT,2) $(call gb_Helper_abbreviate_dirs_native,\ -- cgit From 9da441f0c4375dba0db2237a87845527361c318d Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 6 Apr 2011 12:47:49 +0200 Subject: remove duplicate code This was introduced by commit 3726b1a63e0783953fee9c65d8c0cee3fd6cf85b . --- solenv/gbuild/JunitTest.mk | 64 ---------------------------------------------- 1 file changed, 64 deletions(-) (limited to 'solenv/gbuild/JunitTest.mk') 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 @@ -76,70 +76,6 @@ $(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 -.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)) -- cgit From 7602f5d313821ee5cdd21f5bbae89129d95e52e3 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 1 Jun 2011 16:43:01 +0200 Subject: add debug hook for junit tests --- solenv/gbuild/JunitTest.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'solenv/gbuild/JunitTest.mk') diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index bbbddcf3c733..feac6f0a2273 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -47,7 +47,15 @@ $(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)) + $(gb_JunitTest_JAVACOMMAND) \ + -cp "$(CLASSPATH)" \ + $(if $(strip $(gb_JunitTest_HEADLESS)),\ + -Dorg.openoffice.test.arg.headless=$(gb_JunitTest_HEADLESS)) \ + $(if $(strip $(gb_JunitTest_DEBUGCOMMAND)),\ + '-Dorg.openoffice.test.arg.debugcommand=$(gb_JunitTest_DEBUGCOMMAND)') \ + $(DEFS) \ + org.junit.runner.JUnitCore \ + $(CLASSES) 2>&1 > $@.log || (cat $@.log && false)) $(CLEAN_CMD) define gb_JunitTest_JunitTest -- cgit