Remove some more unnecessary code
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/1e9b2b15 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/1e9b2b15 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/1e9b2b15 Branch: refs/heads/master Commit: 1e9b2b151fe3cd738ad14270f251a1836de394e7 Parents: 0eb556d Author: Sebastian Schaffert <sschaff...@apache.org> Authored: Sun Apr 29 21:55:27 2018 +0200 Committer: Sebastian Schaffert <sschaff...@apache.org> Committed: Sun Apr 29 21:55:27 2018 +0200 ---------------------------------------------------------------------- libraries/ostrich/backend/test/CMakeLists.txt | 8 +++---- libraries/ostrich/backend/test/main.cc | 25 ---------------------- 2 files changed, 4 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/1e9b2b15/libraries/ostrich/backend/test/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/libraries/ostrich/backend/test/CMakeLists.txt b/libraries/ostrich/backend/test/CMakeLists.txt index e195e91..a79a33c 100644 --- a/libraries/ostrich/backend/test/CMakeLists.txt +++ b/libraries/ostrich/backend/test/CMakeLists.txt @@ -7,16 +7,16 @@ include_directories( "${RAPTOR_INCLUDE_DIR}/raptor2" ) -add_executable(model_tests NamespaceTest.cc StatementTest.cc main.cc) +add_executable(model_tests NamespaceTest.cc StatementTest.cc) target_link_libraries(model_tests gtest_main marmotta_model ${GLOG_LIBRARY}) -add_executable(sparql_tests SparqlTest.cc main.cc) +add_executable(sparql_tests SparqlTest.cc) target_link_libraries(sparql_tests gtest_main marmotta_model marmotta_sparql ${GLOG_LIBRARY}) -add_executable(leveldb_tests main.cc LevelDBTest.cc) +add_executable(leveldb_tests LevelDBTest.cc) target_link_libraries(leveldb_tests gtest_main marmotta_leveldb ${GLOG_LIBRARY} ${Boost_LIBRARIES}) -add_executable(persistence_tests main.cc PersistenceTest.cc) +add_executable(persistence_tests PersistenceTest.cc) target_link_libraries(persistence_tests gtest_main marmotta_persistence ${GLOG_LIBRARY} ${Boost_LIBRARIES}) add_test(NAME ModelTest COMMAND model_tests) http://git-wip-us.apache.org/repos/asf/marmotta/blob/1e9b2b15/libraries/ostrich/backend/test/main.cc ---------------------------------------------------------------------- diff --git a/libraries/ostrich/backend/test/main.cc b/libraries/ostrich/backend/test/main.cc deleted file mode 100644 index f659381..0000000 --- a/libraries/ostrich/backend/test/main.cc +++ /dev/null @@ -1,25 +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 <glog/logging.h> -#include "gtest/gtest.h" - -// run all tests in the current binary -int main(int argc, char **argv) { - ::google::InitGoogleLogging(argv[0]); - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -}
