From 419f9e22a756bfed27850daa0935f3560776c3df Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen <b_michaelsen@openoffice.org> Date: Mon, 10 Jan 2011 19:31:53 +0100 Subject: gnumake3: intermediate commit junit tests --- solenv/gbuild/JunitTest.mk | 83 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 solenv/gbuild/JunitTest.mk (limited to 'solenv/gbuild/JunitTest.mk') diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk new file mode 100644 index 000000000000..a1113c72d85e --- /dev/null +++ b/solenv/gbuild/JunitTest.mk @@ -0,0 +1,83 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + + +# JunitTest class + +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 $@) + +.PHONY : $(call gb_JunitTest_get_target,%) +$(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)) + +define gb_JunitTest_JunitTest +$(call gb_JunitTest_get_target,%) : 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,%) : CLASSES := +$(call gb_JunitTest_get_target,%) : 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,$*) \ + +$(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_add_classes +$(info .>.> $(1) $(2)) +$(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 + +# vim: set noet sw=4 ts=4: -- cgit From 16275914bed0433c29f1db08a08fd6b8fd546b80 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen <b_michaelsen@openoffice.org> Date: Tue, 11 Jan 2011 12:43:09 +0100 Subject: gnumake3: complex tests in sfx2 --- solenv/gbuild/JunitTest.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'solenv/gbuild/JunitTest.mk') diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index a1113c72d85e..fb3795a12b27 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -43,9 +43,9 @@ $(call gb_JunitTest_get_target,%) : $(gb_JunitTest_JAVACOMMAND) $(gb_JunitTest_JAVACOMMAND) -cp "$(CLASSPATH)" $(DEFS) org.junit.runner.JUnitCore $(CLASSES)) define gb_JunitTest_JunitTest -$(call gb_JunitTest_get_target,%) : 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,%) : CLASSES := -$(call gb_JunitTest_get_target,%) : DEFS := \ +$(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)) : 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,$*) \ @@ -55,8 +55,12 @@ $(call gb_JunitTest_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call $(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 -$(info .>.> $(1) $(2)) $(call gb_JunitTest_get_target,$(1)) : CLASSES += $(2) endef -- cgit From 9ba809fac54cafd52094cf0d1ac4f2838eca567e Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen <b_michaelsen@openoffice.org> Date: Tue, 11 Jan 2011 21:16:21 +0100 Subject: gnumake3: more work on junit subsequenttest migration --- solenv/gbuild/JunitTest.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'solenv/gbuild/JunitTest.mk') 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))) -- cgit From e0965d953666a943b2bc74a946651810aa29d09c Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen <b_michaelsen@openoffice.org> Date: Wed, 19 Jan 2011 14:16:46 +0100 Subject: gnumake3: #i116390# finishing support for Junittests in gbuild --- solenv/gbuild/JunitTest.mk | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'solenv/gbuild/JunitTest.mk') diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 10330db516ca..478e513c2374 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -43,7 +43,7 @@ $(call gb_JunitTest_get_target,%) : $(gb_JunitTest_JAVACOMMAND) $(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:$(OUTDIR)/bin/ConnectivityTools.jar:$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1))) +$(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_get_target,$(1)) : DEFS := \ -Dorg.openoffice.test.arg.soffice=path:$(OUTDIR)/installation/opt/openoffice.org3/program/soffice \ @@ -62,10 +62,12 @@ 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 @@ -84,4 +86,14 @@ $(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 # vim: set noet sw=4 ts=4: -- cgit From 6a989625fbe559a6845428481122bca8915479ea Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen <b_michaelsen@openoffice.org> Date: Fri, 21 Jan 2011 02:29:25 +0100 Subject: gnumake3: refactoring of gb_*_get_linktargetname --- 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 478e513c2374..4792a429d55b 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -31,7 +31,7 @@ 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_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(call gb_JunitTest_get_classsetname,$(1))) $(call gb_Helper_abbreviate_dirs,\ rm -f $@ $@.log) -- cgit From c126ba333326f4fb51349521b86ff3d573f5ff15 Mon Sep 17 00:00:00 2001 From: Mathias Bauer <mba@openoffice.org> Date: Tue, 25 Jan 2011 18:19:55 +0100 Subject: CWS gnumake3: fix license headers --- solenv/gbuild/JunitTest.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'solenv/gbuild/JunitTest.mk') diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 80c2606bd7f1..a38cb3a75b1a 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # OpenOffice.org is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Lesser General Public License version 3 for more details # (a copy is included in the LICENSE file that accompanied this code). # # You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see +# version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # -- cgit From cfd996bcd66b95f077b606ce1d7a0392feb8cd34 Mon Sep 17 00:00:00 2001 From: Mathias Bauer <mba@openoffice.org> Date: Mon, 31 Jan 2011 16:04:05 +0100 Subject: CWS gnumake3: build Java targets in case env variables for compiler are not set; remove superfluous dependency on java interpreter --- 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 a38cb3a75b1a..43ab78d38049 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -36,7 +36,7 @@ $(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_targe rm -f $@ $@.log) .PHONY : $(call gb_JunitTest_get_target,$(1)) -$(call gb_JunitTest_get_target,%) : $(gb_JunitTest_JAVACOMMAND) +$(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,$*) && \ -- cgit From 175eea527c95a5d71b41746d78419b4039ac15f5 Mon Sep 17 00:00:00 2001 From: Michael Stahl <mst@openoffice.org> Date: Fri, 4 Feb 2011 15:47:34 +0100 Subject: gnumake3: fix JunitTest.mk so it works on OSX --- solenv/gbuild/JunitTest.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'solenv/gbuild/JunitTest.mk') diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 43ab78d38049..965e7fa7e6be 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -28,7 +28,7 @@ # JunitTest class -gb_JunitTest_JAVACOMMAND := $(JAVAINTERPRETER) +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,%)) @@ -45,10 +45,7 @@ $(call gb_JunitTest_get_target,%) : 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_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,$(1)) \ +$(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))) -- cgit From 1bb0c1be05015d1966c05645645b5b176d2a9fec Mon Sep 17 00:00:00 2001 From: Michael Stahl <mst@openoffice.org> Date: Mon, 7 Feb 2011 16:35:59 +0100 Subject: gnumake3: JunitTest.mk: bizarre hacks to make it work on windows --- solenv/gbuild/JunitTest.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'solenv/gbuild/JunitTest.mk') diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 965e7fa7e6be..afc9486fd5a4 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -41,6 +41,7 @@ $(call gb_JunitTest_get_target,%) : $(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 -- cgit