Issue #1303: Restore running the true cpp_unit tests, cpp_system tests remain excluded (#1361)

Author: jiridanek

tests/CMakeLists.txt

@@ -241,8 +241,7 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/config-2
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ssl_certs
         DESTINATION ${QPID_DISPATCH_HOME_INSTALLED}/tests)
 
-add_subdirectory(cpp-stub)
-add_subdirectory(c_unittests)
+add_subdirectory(cpp)
 
 if(BUILD_BENCHMARKS)
   add_subdirectory(c_benchmarks)

tests/c_benchmarks/CMakeLists.txt

@@ -29,7 +29,7 @@ find_package(benchmark REQUIRED)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_STANDARD_FLAGS} ${SANITIZE_FLAGS} -Wno-pedantic -Wno-unused-function")
 
 add_executable(c-benchmarks
-        ../c_unittests/helpers.cpp
+        ../cpp/helpers/helpers.cpp
         c_benchmarks_main.cpp
         bm_router_initialization.cpp
         bm_parse_tree.cpp

tests/c_benchmarks/bm_parse_tree.cpp

@@ -19,7 +19,7 @@
  *
  */
 
-#include "../c_unittests/helpers.hpp"
+#include "../cpp/helpers/helpers.hpp"
 
 #include <benchmark/benchmark.h>
 

tests/c_benchmarks/bm_router_initialization.cpp

@@ -19,7 +19,7 @@
  *
  */
 
-#include "../c_unittests/helpers.hpp"
+#include "../cpp/helpers/helpers.hpp"
 
 #include <benchmark/benchmark.h>
 

tests/c_benchmarks/bm_tcp_adapter.cpp

@@ -19,7 +19,7 @@
  *
  */
 
-#include "../c_unittests/helpers.hpp"
+#include "../cpp/helpers/helpers.hpp"
 #include "SocketException.hpp"
 #include "TCPSocket.hpp"
 #include "echo_server.hpp"

tests/c_benchmarks/echo_server.hpp

@@ -22,7 +22,7 @@
 #ifndef QPID_DISPATCH_ECHO_SERVER_HPP
 #define QPID_DISPATCH_ECHO_SERVER_HPP
 
-#include "../c_unittests/helpers.hpp"
+#include "../cpp/helpers/helpers.hpp"
 #include "SocketException.hpp"
 #include "TCPServerSocket.hpp"
 

tests/cpp/CMakeLists.txt

@@ -0,0 +1,25 @@
+##
+## 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.
+##
+
+add_subdirectory(cpp-stub)
+
+include_directories(helpers)
+
+add_subdirectory(cpp_unit)
+add_subdirectory(cpp_system)