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 /comphelper | |
| parent | 153a326981896a84523d3e6ff5340b2c3497136c (diff) | |
gnumake3: convert some dmake files for tests to gbuild
Diffstat (limited to 'comphelper')
| -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 |
2 files changed, 22 insertions, 24 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: |