diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-02-01 19:21:09 +0100 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2011-02-01 19:21:09 +0100 |
| commit | 2b80af23f8142c9bb970a8de20040098ea8ed2b9 (patch) | |
| tree | 0c23b882981177005e9dc3a73a7df1801bf1adf3 /sot | |
| parent | 153a326981896a84523d3e6ff5340b2c3497136c (diff) | |
gnumake3: convert some dmake files for tests to gbuild
Diffstat (limited to 'sot')
| -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 |
2 files changed, 23 insertions, 32 deletions
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 \ +)) + |