sal/qa/ByteSequence/ByteSequence.cxx | 6 ++++++
sal/qa/ByteSequence/main.cxx | 28 ----------------------------
sal/qa/ByteSequence/makefile.mk | 8 +-------
sal/qa/OStringBuffer/makefile.mk | 6 ------
4 files changed, 7 insertions(+), 41 deletions(-)
New commits:
commit 3b78105d7bcea8d4aecedfa85b7df735890b3bb0
Author: Damjan Jovanovic <dam...@apache.org>
Date: Tue Oct 27 15:52:42 2015 +0000
Remove unnecessary OOO_SUBSEQUENT_TESTS from main/sal/qa/ByteSequence
and main/sal/qa/OStringBuffer.
diff --git a/sal/qa/ByteSequence/ByteSequence.cxx
b/sal/qa/ByteSequence/ByteSequence.cxx
index 6a83482..8fc5c57 100644
--- a/sal/qa/ByteSequence/ByteSequence.cxx
+++ b/sal/qa/ByteSequence/ByteSequence.cxx
@@ -167,3 +167,9 @@ TEST_F(Test, test_diffElem) {
}
+int main(int argc, char **argv)
+{
+ ::testing::InitGoogleTest(&argc, argv);
+ return RUN_ALL_TESTS();
+}
+
diff --git a/sal/qa/ByteSequence/main.cxx b/sal/qa/ByteSequence/main.cxx
index df14e5b..e69de29 100644
--- a/sal/qa/ByteSequence/main.cxx
+++ b/sal/qa/ByteSequence/main.cxx
@@ -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();
-}
diff --git a/sal/qa/ByteSequence/makefile.mk b/sal/qa/ByteSequence/makefile.mk
index 7497219..63c33c3 100644
--- a/sal/qa/ByteSequence/makefile.mk
+++ b/sal/qa/ByteSequence/makefile.mk
@@ -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)" == ""
diff --git a/sal/qa/OStringBuffer/makefile.mk b/sal/qa/OStringBuffer/makefile.mk
index 297cf7d..d3fe5c1 100644
--- a/sal/qa/OStringBuffer/makefile.mk
+++ b/sal/qa/OStringBuffer/makefile.mk
@@ -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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
