diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-11 12:43:09 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-11 12:43:09 +0100 |
| commit | 16275914bed0433c29f1db08a08fd6b8fd546b80 (patch) | |
| tree | 5e34624890f49fbbc0d29c52413b6a6b24222882 /solenv/gbuild/JunitTest.mk | |
| parent | 419f9e22a756bfed27850daa0935f3560776c3df (diff) | |
gnumake3: complex tests in sfx2
Diffstat (limited to 'solenv/gbuild/JunitTest.mk')
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 12 |
1 files changed, 8 insertions, 4 deletions
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 |