Author: damjan
Date: Tue Oct 27 15:52:42 2015
New Revision: 1710840
URL: http://svn.apache.org/viewvc?rev=1710840&view=rev
Log:
Remove unnecessary OOO_SUBSEQUENT_TESTS from main/sal/qa/ByteSequence
and main/sal/qa/OStringBuffer.
Modified:
openoffice/trunk/main/sal/qa/ByteSequence/ByteSequence.cxx
openoffice/trunk/main/sal/qa/ByteSequence/main.cxx
openoffice/trunk/main/sal/qa/ByteSequence/makefile.mk
openoffice/trunk/main/sal/qa/OStringBuffer/makefile.mk
Modified: openoffice/trunk/main/sal/qa/ByteSequence/ByteSequence.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/ByteSequence/ByteSequence.cxx?rev=1710840&r1=1710839&r2=1710840&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/ByteSequence/ByteSequence.cxx (original)
+++ openoffice/trunk/main/sal/qa/ByteSequence/ByteSequence.cxx Tue Oct 27
15:52:42 2015
@@ -167,3 +167,9 @@ TEST_F(Test, test_diffElem) {
}
+int main(int argc, char **argv)
+{
+ ::testing::InitGoogleTest(&argc, argv);
+ return RUN_ALL_TESTS();
+}
+
Modified: openoffice/trunk/main/sal/qa/ByteSequence/main.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/ByteSequence/main.cxx?rev=1710840&r1=1710839&r2=1710840&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/ByteSequence/main.cxx (original)
+++ openoffice/trunk/main/sal/qa/ByteSequence/main.cxx Tue Oct 27 15:52:42 2015
@@ -1,28 +0,0 @@
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-#include "gtest/gtest.h"
-
-int main(int argc, char **argv)
-{
- ::testing::InitGoogleTest(&argc, argv);
- return RUN_ALL_TESTS();
-}
Modified: openoffice/trunk/main/sal/qa/ByteSequence/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/ByteSequence/makefile.mk?rev=1710840&r1=1710839&r2=1710840&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/ByteSequence/makefile.mk (original)
+++ openoffice/trunk/main/sal/qa/ByteSequence/makefile.mk Tue Oct 27 15:52:42
2015
@@ -21,10 +21,6 @@
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
PRJ = ../..
PRJNAME = sal
TARGET = qa_ByteSequence
@@ -39,7 +35,7 @@ all:
.ELSE
-APP1OBJS = $(SLO)/ByteSequence.obj $(SLO)/main.obj
+APP1OBJS = $(SLO)/ByteSequence.obj
APP1RPATH = NONE
APP1STDLIBS = $(GTESTLIB) $(SALLIB)
APP1TARGET = rtl_ByteSequence
@@ -48,5 +44,3 @@ APP1TEST = enabled
.INCLUDE: target.mk
.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
-
-.END # "$(OOO_SUBSEQUENT_TESTS)" == ""
Modified: openoffice/trunk/main/sal/qa/OStringBuffer/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/OStringBuffer/makefile.mk?rev=1710840&r1=1710839&r2=1710840&view=diff
==============================================================================
--- openoffice/trunk/main/sal/qa/OStringBuffer/makefile.mk (original)
+++ openoffice/trunk/main/sal/qa/OStringBuffer/makefile.mk Tue Oct 27 15:52:42
2015
@@ -21,10 +21,6 @@
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
PRJ=..$/..
PRJNAME=sal
@@ -61,5 +57,3 @@ APP1TEST = enabled
.INCLUDE : target.mk
.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
-
-.END
