[install] Add install test

c-jimenez · c-jimenez · commit 09579540d3a5 · 2022-02-11T22:51:58.000+01:00
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
diff --git a/.github/workflows/install-test.yml b/.github/workflows/install-test.yml
@@ -0,0 +1,19 @@
+name: Install test
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ main, develop ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: make gcc install
+      run: make BUILD_TYPE=Release INSTALL_PREFIX=/tmp/install-gcc tests-install-gcc-native
+    - name: make clang install
+      run: make BUILD_TYPE=Release INSTALL_PREFIX=/tmp/install-clang tests-install-clang-native
diff --git a/.github/workflows/unit-test-debug.yml b/.github/workflows/unit-test-debug.yml
@@ -0,0 +1,23 @@
+name: Unit test in Debug build
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ main, develop ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: make gcc Debug
+      run: make gcc-native BUILD_TYPE=Debug
+    - name: unit tests gcc Debug
+      run: make tests-gcc-native BUILD_TYPE=Debug
+    - name: make clang Debug
+      run: make clang-native BUILD_TYPE=Debug
+    - name: unit tests clang
+      run: make tests-clang-native BUILD_TYPE=Debug
diff --git a/.github/workflows/unit-test-release.yml b/.github/workflows/unit-test-release.yml
@@ -0,0 +1,23 @@
+name: Unit test in Release build
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ main, develop ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: make gcc Release
+      run: make gcc-native BUILD_TYPE=Release
+    - name: unit tests gcc Release
+      run: make tests-gcc-native BUILD_TYPE=Release
+    - name: make clang Release
+      run: make clang-native BUILD_TYPE=Release
+    - name: unit tests clang
+      run: make tests-clang-native BUILD_TYPE=Release
diff --git a/3rdparty/libwebsockets/lib/CMakeLists.txt b/3rdparty/libwebsockets/lib/CMakeLists.txt
@@ -169,13 +169,13 @@ if (LWS_WITH_STATIC)
 	target_include_directories(websockets PRIVATE ${LWS_LIB_BUILD_INC_PATHS})
 	target_compile_definitions(websockets PRIVATE LWS_BUILDING_STATIC)
 
-	if (WIN32)
+	#if (WIN32)
 		# Windows uses the same .lib ending for static libraries and shared
 		# library linker files, so rename the static library.
 		set_target_properties(websockets
 			PROPERTIES
 			OUTPUT_NAME websockets_static)
-	endif()
+	#endif()
 	
 endif()
 
@@ -375,4 +375,3 @@ set(LIB_LIST_AT_END ${LIB_LIST_AT_END} PARENT_SCOPE)
 endif()
 set(USE_WOLFSSL ${USE_WOLFSSL} PARENT_SCOPE)
 set(LWS_DEPS_LIB_PATHS ${LWS_DEPS_LIB_PATHS} PARENT_SCOPE)
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -72,8 +72,6 @@ if(${BUILD_STATIC_LIBRARY})
         json
         ws
         websockets
-
-        dl
     )
     set_target_properties(open-ocpp-static PROPERTIES OUTPUT_NAME "open-ocpp_static")
     set(OPEN_OCPP_STATIC_TARGET open-ocpp-static)
@@ -97,7 +95,7 @@ target_link_libraries(open-ocpp-dynamic
     ws
     websockets
 
-    dl
+    stdc++fs
 )
 set_target_properties(open-ocpp-dynamic PROPERTIES OUTPUT_NAME "open-ocpp")
 
@@ -107,8 +105,6 @@ include(GNUInstallDirs)
 file(GLOB_RECURSE PUBLIC_HEADERS RELATIVE ${CMAKE_SOURCE_DIR} "src/*.h")
 
 install(TARGETS open-ocpp-dynamic ${OPEN_OCPP_STATIC_TARGET}
-        EXPORT LibOpenOcppTargets
-
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -117,7 +113,7 @@ install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openocpp
 
 # Generate pkgconfig files
 set(PKG_CONFIG_LIBDIR       "\${prefix}/lib")
-set(PKG_CONFIG_INCLUDEDIR   "\${prefix}/openocpp")
+set(PKG_CONFIG_INCLUDEDIR   "\${prefix}/include/openocpp")
 set(PKG_CONFIG_LIBS         "-L\${libdir}")
 set(PKG_CONFIG_CFLAGS       "-I\${includedir}")
 
diff --git a/CMakeLists_Options.txt b/CMakeLists_Options.txt
@@ -10,7 +10,7 @@ add_compile_definitions(LOG_LEVEL=${LOG_LEVEL})
 
 # Static library
 if(NOT DEFINED BUILD_STATIC_LIBRARY)
-    set(BUILD_STATIC_LIBRARY    ON)
+    set(BUILD_STATIC_LIBRARY    OFF)
 endif()
 
 # Unit tests
diff --git a/README.md b/README.md
@@ -364,6 +364,8 @@ Then you wil be able to use the following targets as dependencies for your proje
 
 **Note**: If **Open OCPP** has been installed in a non standard directory, the search path for the ```pkg_search_module``` command must be specified using the following command => ```set(ENV{PKG_CONFIG_PATH} "/your/directory/containing/the/.pc/files")```
 
+See the deploy test [CMakeLists.txt](./tests/deploy/CMakeLists.txt) as an example
+
 ## Quick start
 
 The best way to start is to take a look at the [examples](./examples/README.md) and more specifically at the [quick start Charge Point example](./examples/quick_start_chargepoint/README.md) and the [quick start Central System example](./examples/quick_start_centralsystem/README.md).
diff --git a/examples/common/CMakeLists.txt b/examples/common/CMakeLists.txt
@@ -14,4 +14,5 @@ target_include_directories(examples_common PUBLIC . config simulators)
 # Dependencies
 target_link_libraries(examples_common
     open-ocpp-dynamic
+    pthread
 )
diff --git a/examples/common/DefaultCentralSystemEventsHandler.cpp b/examples/common/DefaultCentralSystemEventsHandler.cpp
@@ -357,7 +357,8 @@ bool DefaultCentralSystemEventsHandler::ChargePointRequestHandler::signCertifica
                 std::stringstream sign_cert_cmd_line;
                 sign_cert_cmd_line << "openssl x509 -req -sha256 -days 3650 -in " << csr_filename << " -CA " << ca_cert_path << " -CAkey "
                                    << ca_cert_key_path << " -CAcreateserial -out " << certificate_filename;
-                system(sign_cert_cmd_line.str().c_str());
+                int err = WEXITSTATUS(system(sign_cert_cmd_line.str().c_str()));
+                cout << "Command line : " << sign_cert_cmd_line.str() << " => " << err << endl;
 
                 // Check if the certificate has been generated
                 if (std::filesystem::exists(certificate_filename))
@@ -366,7 +367,8 @@ bool DefaultCentralSystemEventsHandler::ChargePointRequestHandler::signCertifica
                     std::string       bundle_filename = certificate_filename + ".bundle";
                     std::stringstream generate_bundle_cmd_line;
                     generate_bundle_cmd_line << "cat " << certificate_filename << " " << ca_cert_path << " > " << bundle_filename;
-                    system(generate_bundle_cmd_line.str().c_str());
+                    err = WEXITSTATUS(system(generate_bundle_cmd_line.str().c_str()));
+                    cout << "Command line : " << generate_bundle_cmd_line.str() << " => " << err << endl;
                     if (std::filesystem::exists(bundle_filename))
                     {
                         m_generated_certificate = bundle_filename;
diff --git a/examples/common/DefaultChargePointEventsHandler.cpp b/examples/common/DefaultChargePointEventsHandler.cpp
@@ -208,7 +208,8 @@ std::string DefaultChargePointEventsHandler::getDiagnostics(const ocpp::types::O
 
     std::stringstream ss;
     ss << "zip " << diag_file << " " << m_config.stackConfig().databasePath();
-    system(ss.str().c_str());
+    int err = WEXITSTATUS(system(ss.str().c_str()));
+    cout << "Command line : " << ss.str() << " => " << err << endl;
 
     return diag_file;
 }
@@ -594,7 +595,8 @@ std::string DefaultChargePointEventsHandler::getLog(ocpp::types::LogEnumType
 
         std::stringstream ss;
         ss << "zip " << log_file << " " << m_config.stackConfig().databasePath();
-        system(ss.str().c_str());
+        int err = WEXITSTATUS(system(ss.str().c_str()));
+        cout << "Command line : " << ss.str() << " => " << err << endl;
     }
 
     return log_file;
diff --git a/makefile b/makefile
@@ -53,7 +53,14 @@ clean-gcc-native:
 
 install-gcc-native: gcc-native
 	@echo "Installing Open OCPP library compiled with gcc-native..."
-	@cmake --install $(GCC_NATIVE_BUILD_DIR) $(CMAKE_INSTALL_PREFIX_CMD) --strip
+	@cmake --build $(GCC_NATIVE_BUILD_DIR) --target install --config $(BUILD_TYPE)
+
+tests-install-gcc-native: gcc-native install-gcc-native
+	@echo "Testing Open OCPP library installation with gcc-native..."
+	@mkdir -p $(GCC_NATIVE_BUILD_DIR)/tests/deploy
+	@cd $(GCC_NATIVE_BUILD_DIR)/tests/deploy && export CC=gcc && export CXX=g++ && cmake -D CMAKE_BUILD_TYPE=$(BUILD_TYPE) -D TARGET=native $(CMAKE_INSTALL_PREFIX) $(ROOT_DIR)/tests/deploy
+	@make --silent -C $(GCC_NATIVE_BUILD_DIR)/tests/deploy $(VERBOSE) $(PARALLEL_BUILD)
+	@echo "gcc-native build installation checked!"
 
 $(GCC_NATIVE_BUILD_DIR)/Makefile:
 	@echo "Generating gcc-native makefiles..."
@@ -83,7 +90,14 @@ clean-clang-native:
 
 install-clang-native: clang-native
 	@echo "Installing Open OCPP library compiled with clang-native..."
-	@cmake --install $(GCC_NATIVE_BUILD_DIR) $(CMAKE_INSTALL_PREFIX_CMD) --strip
+	@cmake --build $(CLANG_NATIVE_BUILD_DIR) --target install --config $(BUILD_TYPE)
+
+tests-install-clang-native: clang-native install-clang-native
+	@echo "Testing Open OCPP library installation with clang-native..."
+	@mkdir -p $(CLANG_NATIVE_BUILD_DIR)/tests/deploy
+	@cd $(CLANG_NATIVE_BUILD_DIR)/tests/deploy && export CC=clang && export CXX=clang++ && cmake -D CMAKE_BUILD_TYPE=$(BUILD_TYPE) -D TARGET=native -D _CMAKE_TOOLCHAIN_PREFIX=llvm- -D BIN_DIR=$(CLANG_NATIVE_BIN_DIR) $(CMAKE_INSTALL_PREFIX) $(ROOT_DIR)/tests/deploy
+	@make --silent -C $(CLANG_NATIVE_BUILD_DIR)/tests/deploy $(VERBOSE) $(PARALLEL_BUILD)
+	@echo "clang-native build installation checked!"
 
 $(CLANG_NATIVE_BUILD_DIR)/Makefile:
 	@echo "Generating clang-native makefiles..."
diff --git a/src/centralsystem/CMakeLists.txt b/src/centralsystem/CMakeLists.txt
@@ -28,6 +28,4 @@ target_link_libraries(centralsystem
     log
     version
     x509
-
-    dl
 )
diff --git a/src/chargepoint/CMakeLists.txt b/src/chargepoint/CMakeLists.txt
@@ -57,6 +57,4 @@ target_link_libraries(chargepoint PUBLIC
     log
     version
     x509
-
-    dl
 )
diff --git a/src/messages/CMakeLists.txt b/src/messages/CMakeLists.txt
@@ -66,5 +66,4 @@ target_link_libraries(messages PUBLIC
     helpers
     types
     log
-    -lstdc++fs
 )
diff --git a/src/websockets/CMakeLists.txt b/src/websockets/CMakeLists.txt
@@ -24,5 +24,4 @@ target_include_directories(ws PUBLIC . stubs)
 target_link_libraries(ws PUBLIC
     websockets
     helpers
-    pthread
 )
diff --git a/tests/deploy/CMakeLists.txt b/tests/deploy/CMakeLists.txt
@@ -0,0 +1,52 @@
+#################################################################################
+#                  Test installation of the OCPP library                        #
+#################################################################################
+
+cmake_minimum_required(VERSION 3.13)
+
+# Build options
+include(../../CMakeLists_Options.txt)
+
+# Target toolchain definition and specific compiler flags
+if(NOT DEFINED TARGET)
+    set(TARGET native)
+endif()
+include(../../CMakeLists_${TARGET}.txt)
+
+# Look for Open-OCPP packages
+find_package(PkgConfig)
+set(ENV{PKG_CONFIG_PATH} "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/")
+pkg_search_module(PKG_OPEN_OCPP REQUIRED IMPORTED_TARGET libopen-ocpp)
+if(${BUILD_STATIC_LIBRARY})
+pkg_search_module(PKG_OPEN_OCPP_STATIC REQUIRED IMPORTED_TARGET libopen-ocpp_static)
+pkg_search_module(PKG_WEBSOCKETS_STATIC REQUIRED IMPORTED_TARGET libwebsockets_static)
+endif()
+
+# Look for OpenSSL and SQlite3
+find_package(OpenSSL REQUIRED COMPONENTS SSL Crypto)
+
+# Test applications
+add_executable(test_install_dynamic main.cpp)
+target_link_libraries(test_install_dynamic
+            PkgConfig::PKG_OPEN_OCPP
+            OpenSSL::SSL
+            OpenSSL::Crypto
+            sqlite3
+            pthread
+            stdc++fs
+)
+
+if(${BUILD_STATIC_LIBRARY})
+
+add_executable(test_install_static main.cpp)
+target_link_libraries(test_install_static
+            PkgConfig::PKG_OPEN_OCPP_STATIC
+            PkgConfig::PKG_WEBSOCKETS_STATIC
+            OpenSSL::SSL
+            OpenSSL::Crypto
+            sqlite3
+            pthread
+            stdc++fs
+)
+
+endif()
diff --git a/tests/deploy/main.cpp b/tests/deploy/main.cpp
diff --git a/tests/rpc/CMakeLists.txt b/tests/rpc/CMakeLists.txt
diff --git a/tests/tools/CMakeLists.txt b/tests/tools/CMakeLists.txt
diff --git a/tests/tools/test_workerthreadpool.cpp b/tests/tools/test_workerthreadpool.cpp
diff --git a/tests/websockets/CMakeLists.txt b/tests/websockets/CMakeLists.txt

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,5 @@ target_include_directories(examples_common PUBLIC . config simulators)`
`14`	`14`	`# Dependencies`
`15`	`15`	`target_link_libraries(examples_common`
`16`	`16`	`open-ocpp-dynamic`
	`17`	`+ pthread`
`17`	`18`	`)`