diff options
| -rw-r--r-- | sfx2/qa/unoapi/Test.java | 5 | ||||
| -rwxr-xr-x | svx/JunitTest_svx_unoapi.mk | 2 | ||||
| -rw-r--r-- | svx/prj/build.lst | 4 | ||||
| -rw-r--r-- | svx/qa/unoapi/makefile.mk | 48 |
4 files changed, 4 insertions, 55 deletions
diff --git a/sfx2/qa/unoapi/Test.java b/sfx2/qa/unoapi/Test.java index 4263985c133f..c1231c975a2b 100644 --- a/sfx2/qa/unoapi/Test.java +++ b/sfx2/qa/unoapi/Test.java @@ -27,6 +27,7 @@ package org.openoffice.sfx2.qa.unoapi; import org.openoffice.Runner; import org.openoffice.test.OfficeConnection; +import org.openoffice.test.Argument; import static org.junit.Assert.*; public final class Test { @@ -43,8 +44,8 @@ public final class Test { @org.junit.Test public void test() { assertTrue( Runner.run( - "-sce", "sfx.sce", "-xcl", "knownissues.xcl", "-tdoc", - "testdocuments", "-cs", connection.getDescription())); + "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc", + Argument.get("tdoc"), "-cs", connection.getDescription())); } private final OfficeConnection connection = new OfficeConnection(); diff --git a/svx/JunitTest_svx_unoapi.mk b/svx/JunitTest_svx_unoapi.mk index 3e0d5473c669..d6597f85e8e7 100755 --- a/svx/JunitTest_svx_unoapi.mk +++ b/svx/JunitTest_svx_unoapi.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/svx/prj/build.lst b/svx/prj/build.lst index 1471763b4cb8..7b541b2d77c4 100644 --- a/svx/prj/build.lst +++ b/svx/prj/build.lst @@ -1,6 +1,2 @@ sx svx : sfx2 l10n oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt NULL - -sx svx usr1 - all sx_mkout NULL sx svx\prj nmake - all sx_prj NULL - -# sx svx\qa\unoapi nmake - all sx_qa_unoapi NULL diff --git a/svx/qa/unoapi/makefile.mk b/svx/qa/unoapi/makefile.mk deleted file mode 100644 index 133e9a3458e4..000000000000 --- a/svx/qa/unoapi/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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. -#***********************************************************************/ - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../.. -PRJNAME = svx -TARGET = qa_unoapi - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = org/openoffice/svx/qa/unoapi -JAVATESTFILES = Test.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END |