PR #9338 from Matan: [LibCI] move test functions/variables into test.cpp

IntelRealSense · Jul 5, 2021 · c777ea6 · c777ea6
2 parents 3fe95d4 + f640a52
commit c777ea6
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 83 deletions.
diff --git a/common/utilities/number/stabilized-value.h b/common/utilities/number/stabilized-value.h
@@ -7,6 +7,7 @@
 #include <atomic>
 #include <mutex>
 #include <deque>
+#include <unordered_map>
 
 namespace utilities {
 namespace number {

diff --git a/unit-tests/algo/algo-common.h b/unit-tests/algo/algo-common.h
@@ -8,12 +8,6 @@
 #include "../catch.h"
 
 #include <easylogging++.h>
-#ifdef BUILD_SHARED_LIBS
-// With static linkage, ELPP is initialized by librealsense, so doing it here will
-// create errors. When we're using the shared .so/.dll, the two are separate and we have
-// to initialize ours if we want to use the APIs!
-INITIALIZE_EASYLOGGINGPP
-#endif
 
 #if defined( __ALGO_EPSILON )
 #define __EPSILON __ALGO_EPSILON

diff --git a/unit-tests/live/d400/test-hdr.cpp b/unit-tests/live/d400/test-hdr.cpp
@@ -10,14 +10,6 @@
 #include "../../catch.h"
 #include "../../unit-tests-common.h"
 
-#include <easylogging++.h>
-#ifdef BUILD_SHARED_LIBS
-// With static linkage, ELPP is initialized by librealsense, so doing it here will
-// create errors. When we're using the shared .so/.dll, the two are separate and we have
-// to initialize ours if we want to use the APIs!
-INITIALIZE_EASYLOGGINGPP
-#endif
-
 using namespace rs2;
 
 // HDR CONFIGURATION TESTS

diff --git a/unit-tests/live/extrinsics/test-consistency.cpp b/unit-tests/live/extrinsics/test-consistency.cpp
@@ -6,12 +6,6 @@
 //#test:device SR300*
 
 #include <easylogging++.h>
-#ifdef BUILD_SHARED_LIBS
-// With static linkage, ELPP is initialized by librealsense, so doing it here will
-// create errors. When we're using the shared .so/.dll, the two are separate and we have
-// to initialize ours if we want to use the APIs!
-INITIALIZE_EASYLOGGINGPP
-#endif
 
 #include "../../catch.h"
 

diff --git a/unit-tests/log/log-common.h b/unit-tests/log/log-common.h
@@ -3,17 +3,9 @@
 
 #pragma once
 
-#include <librealsense2/rs.hpp>   // Include RealSense Cross Platform API
-
-#include "../catch.h"
-
+#include <unit-tests/test.h>
 #include <easylogging++.h>
-#ifdef BUILD_SHARED_LIBS
-// With static linkage, ELPP is initialized by librealsense, so doing it here will
-// create errors. When we're using the shared .so/.dll, the two are separate and we have
-// to initialize ours if we want to use the APIs!
-INITIALIZE_EASYLOGGINGPP
-#endif
+
 
 // Define our own logging macro for debugging to stdout
 // Can possibly turn it on automatically based on the Catch options supplied

diff --git a/unit-tests/log/test-c-all.cpp b/unit-tests/log/test-c-all.cpp
@@ -1,7 +1,6 @@
 // License: Apache 2.0. See LICENSE file in root directory.
 // Copyright(c) 2020 Intel Corporation. All Rights Reserved.
 
-//#cmake:add-file log-common.h
 #include "log-common.h"
 
 
@@ -19,7 +18,7 @@ void c_callback( rs2_log_severity severity, rs2_log_message const* msg, void * a
 }
 
 
-TEST_CASE( "Logging C ALL", "[log]" ) {
+TEST_CASE( "Logging C ALL" ) {
     c_n_callbacks = 0;
 
     // ALL == will log everything

diff --git a/unit-tests/test.cpp b/unit-tests/test.cpp
@@ -0,0 +1,17 @@
+// License: Apache 2.0. See LICENSE file in root directory.
+// Copyright(c) 2021 Intel Corporation. All Rights Reserved.
+
+#include <string>
+
+
+#include <easylogging++.h>
+#ifdef BUILD_SHARED_LIBS
+// With static linkage, ELPP is initialized by librealsense, so doing it here will
+// create errors. When we're using the shared .so/.dll, the two are separate and we have
+// to initialize ours if we want to use the APIs!
+INITIALIZE_EASYLOGGINGPP
+#endif
+
+namespace test {
+    std::string context;
+}
diff --git a/unit-tests/test.h b/unit-tests/test.h
@@ -9,14 +9,7 @@ namespace test {
 	extern std::string context;
 }
 
-#include "librealsense2/rs.hpp"
+#include <librealsense2/rs.hpp>
 
 #include "catch.h"
 
-#include <easylogging++.h>
-#ifdef BUILD_SHARED_LIBS
-// With static linkage, ELPP is initialized by librealsense, so doing it here will
-// create errors. When we're using the shared .so/.dll, the two are separate and we have
-// to initialize ours if we want to use the APIs!
-INITIALIZE_EASYLOGGINGPP
-#endif
diff --git a/unit-tests/types/test-pose.cpp b/unit-tests/types/test-pose.cpp
@@ -2,12 +2,6 @@
 // Copyright(c) 2020 Intel Corporation. All Rights Reserved.
 
 #include <easylogging++.h>
-#ifdef BUILD_SHARED_LIBS
-// With static linkage, ELPP is initialized by librealsense, so doing it here will
-// create errors. When we're using the shared .so/.dll, the two are separate and we have
-// to initialize ours if we want to use the APIs!
-INITIALIZE_EASYLOGGINGPP
-#endif
 
 #include "../catch.h"
 

diff --git a/unit-tests/unit-test-config.py b/unit-tests/unit-test-config.py
@@ -90,7 +90,7 @@ def generate_cmake( builddir, testdir, testname, filelist, custom_main ):
 set( SRC_FILES ''' + filelist + '''
 )
 add_executable( ''' + testname + ''' ${SRC_FILES} )
-source_group( "Common Files" FILES ${ELPP_FILES} ${CATCH_FILES}''' )
+source_group( "Common Files" FILES ${ELPP_FILES} ${CATCH_FILES} ''' + dir + '''/test.cpp''' )
     if not custom_main:
         handle.write( ' ' + dir + '/unit-test-default-main.cpp' )
     handle.write( ''' )
@@ -254,6 +254,9 @@ def process_cpp( dir, builddir ):
             for include in includes:
                 filelist.append( include )
 
+            # all tests use the common test.cpp file
+            filelist.append( root + "/unit-tests/test.cpp" )
+
             # 'cmake:custom-main' indicates that the test is defining its own main() function.
             # If not specified we use a default main() which lives in its own .cpp:
             if not custom_main:

diff --git a/unit-tests/unit-test-default-main.cpp b/unit-tests/unit-test-default-main.cpp
@@ -18,13 +18,7 @@ See below for each of the custom options...
 
 // We are not using the main from catch2
 #define CATCH_CONFIG_RUNNER
-#include <unit-tests/catch/catch.hpp>
-#include <string>
-#include <librealsense2/rs.hpp>  // rs2::log_to_console
-
-namespace test {
-    std::string context;
-}
+#include <unit-tests/test.h>
 
 using namespace Catch::clara;
 

diff --git a/unit-tests/utilities/imgui/common.h b/unit-tests/utilities/imgui/common.h
@@ -3,11 +3,3 @@
 
 #include "../../catch.h"
 
-#include <easylogging++.h>
-#ifdef BUILD_SHARED_LIBS
-// With static linkage, ELPP is initialized by librealsense, so doing it here will
-// create errors. When we're using the shared .so/.dll, the two are separate and we have
-// to initialize ours if we want to use the APIs!
-INITIALIZE_EASYLOGGINGPP
-#endif
-
diff --git a/unit-tests/utilities/string/common.h b/unit-tests/utilities/string/common.h
@@ -4,10 +4,4 @@
 #include "../../catch.h"
 
 #include <easylogging++.h>
-#ifdef BUILD_SHARED_LIBS
-// With static linkage, ELPP is initialized by librealsense, so doing it here will
-// create errors. When we're using the shared .so/.dll, the two are separate and we have
-// to initialize ours if we want to use the APIs!
-INITIALIZE_EASYLOGGINGPP
-#endif
 
diff --git a/unit-tests/utilities/time/common.h b/unit-tests/utilities/time/common.h
@@ -3,13 +3,7 @@
 
 #include "../../catch.h"
 
-#include <easylogging++.h>
-#ifdef BUILD_SHARED_LIBS
-// With static linkage, ELPP is initialized by librealsense, so doing it here will
-// create errors. When we're using the shared .so/.dll, the two are separate and we have
-// to initialize ours if we want to use the APIs!
-INITIALIZE_EASYLOGGINGPP
-#endif
+#include <thread>
 
 const auto TEST_DELTA_TIME_MS = 500;
 const auto TEST_DELTA_TIME = std::chrono::milliseconds(TEST_DELTA_TIME_MS);
diff --git a/unit-tests/utilities/time/test-waiting-on.cpp b/unit-tests/utilities/time/test-waiting-on.cpp
@@ -1,14 +1,6 @@
 // License: Apache 2.0. See LICENSE file in root directory.
 // Copyright(c) 2021 Intel Corporation. All Rights Reserved.
 
-#include <easylogging++.h>
-#ifdef BUILD_SHARED_LIBS
-// With static linkage, ELPP is initialized by librealsense, so doing it here will
-// create errors. When we're using the shared .so/.dll, the two are separate and we have
-// to initialize ours if we want to use the APIs!
-INITIALIZE_EASYLOGGINGPP
-#endif
-
 #include <unit-tests/catch.h>
 #include <common/utilities/time/waiting-on.h>
 #include <queue>