diff options
| -rw-r--r-- | comphelper/JunitTest_comphelper_complex.mk (renamed from comphelper/qa/complex/comphelper/makefile.mk) | 42 | ||||
| -rw-r--r-- | comphelper/Module_comphelper.mk | 4 | ||||
| -rw-r--r-- | sot/JunitTest_sot_complex.mk (renamed from sot/qa/complex/olesimplestorage/makefile.mk) | 51 | ||||
| -rw-r--r-- | sot/Module_sot.mk | 4 |
4 files changed, 45 insertions, 56 deletions
diff --git a/comphelper/qa/complex/comphelper/makefile.mk b/comphelper/JunitTest_comphelper_complex.mk index 238bbd5c991d..5da6f2cd2061 100644 --- a/comphelper/qa/complex/comphelper/makefile.mk +++ b/comphelper/JunitTest_comphelper_complex.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,30 +25,24 @@ # #************************************************************************* -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE +$(eval $(call gb_JunitTest_JunitTest,comphelper_complex)) -PRJ = ../../.. -PRJNAME = comphelper -TARGET = qa_complex_comphelper +$(eval $(call gb_JunitTest_add_sourcefiles,comphelper_complex,\ + comphelper/qa/complex/comphelper/Map \ + comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest \ +)) -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/comphelper -JAVATESTFILES = \ - Map.java \ - SequenceOutputStreamUnitTest.java - -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar jurt.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END +$(eval $(call gb_JunitTest_add_jars,comphelper_complex,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END +$(eval $(call gb_JunitTest_add_classes,comphelper_complex,\ + complex.comphelper.SequenceOutputStreamUnitTest \ + complex.comphelper.Map \ +)) +# vim: set noet sw=4 ts=4: diff --git a/comphelper/Module_comphelper.mk b/comphelper/Module_comphelper.mk index 8f447566cf5f..e39d973fe23e 100644 --- a/comphelper/Module_comphelper.mk +++ b/comphelper/Module_comphelper.mk @@ -32,4 +32,8 @@ $(eval $(call gb_Module_add_targets,comphelper,\ Library_comphelp \ )) +$(eval $(call gb_Module_add_subsequentcheck_targets,comphelper,\ + JunitTest_comphelper_complex \ +)) + # vim: set noet ts=4 sw=4: diff --git a/sot/qa/complex/olesimplestorage/makefile.mk b/sot/JunitTest_sot_complex.mk index cf3facf94d66..e515ab539659 100644 --- a/sot/qa/complex/olesimplestorage/makefile.mk +++ b/sot/JunitTest_sot_complex.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,38 +25,25 @@ # #************************************************************************* -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = sot -TARGET = qa_complex_olesimplestorage - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/olesimplestorage -JAVATESTFILES = \ - OLESimpleStorageUnitTest.java - -JAVAFILES = $(JAVATESTFILES) \ - OLESimpleStorageTest.java \ - Test01.java \ - TestHelper.java - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar jurt.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - - +$(eval $(call gb_JunitTest_JunitTest,sot_complex)) +$(eval $(call gb_JunitTest_add_sourcefiles,sot_complex,\ + sot/qa/complex/olesimplestorage/OLESimpleStorageTest \ + sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest \ + sot/qa/complex/olesimplestorage/Test01 \ + sot/qa/complex/olesimplestorage/TestHelper \ +)) +$(eval $(call gb_JunitTest_add_jars,sot_complex,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) +$(eval $(call gb_JunitTest_add_classes,sot_complex,\ + complex.olesimplestorage.OLESimpleStorageUnitTest \ +)) +# vim: set noet sw=4 ts=4: diff --git a/sot/Module_sot.mk b/sot/Module_sot.mk index 95e5d2898b28..a9b72bf5f8d6 100644 --- a/sot/Module_sot.mk +++ b/sot/Module_sot.mk @@ -32,3 +32,7 @@ $(eval $(call gb_Module_add_targets,sot,\ Library_sot \ )) +$(eval $(call gb_Module_add_subsequentcheck_targets,sot,\ + JunitTest_sot_complex \ +)) + |