Fill in the Blanks for More EPOS Stuff

.github/workflows/build-cmake.yml

@@ -5,18 +5,16 @@ on:
     branches: ["main"]
     paths:
       - ".github/workflows/build-cmake.yml"
-      - "ipc/**/*.c"
-      - "ipc/**/*.h"
-      - "test/*.c"
+      - "**/*.c"
+      - "**/*.h"
       - "**/CMakeLists.txt"
       - "cmake/*.cmake"
   push:
     branches: ["main"]
     paths:
       - ".github/workflows/build-cmake.yml"
-      - "ipc/**/*.c"
-      - "ipc/**/*.h"
-      - "test/*.c"
+      - "**/*.c"
+      - "**/*.h"
       - "**/CMakeLists.txt"
       - "cmake/*.cmake"
 
@@ -38,6 +36,9 @@ jobs:
       - name: Build
         run: |
           cmake --build build
+      - name: Test
+        run: |
+          ctest --verbose --output-on-failure --test-dir ${{ github.workspace }}/build/test
 
   windows-build-cmake:
     name: Windows
@@ -57,3 +58,6 @@ jobs:
       - name: Build
         run: |
           cmake --build build
+      - name: Test
+        run: |
+          ctest --verbose --output-on-failure --test-dir ${{ github.workspace }}/build/test

CMakeLists.txt

@@ -4,8 +4,10 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 project(libtestrig
 	LANGUAGES C)
 
+include(CTest)
 include(target_copy_dll)
 include(target_output_to_bin)
+include(target_compile_warn_all)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib")
@@ -15,6 +17,8 @@ set(BIN_DIR "${CMAKE_SOURCE_DIR}/bin")
 
 set(IPC_SOURCES
 	"${IPC_DIR}/ipc.c"
+	"${IPC_DIR}/pipe.c"
+	"${IPC_DIR}/sock.c"
 	"${IPC_DIR}/message.c"
 	"${IPC_DIR}/os.c")
 
@@ -27,13 +31,6 @@ set(EPOS_SOURCES
 
 set(LIBTESTRIG_SOURCES ${IPC_SOURCES} ${EPOS_SOURCES})
 
-if (MSVC)
-	add_compile_options("/W4")
-else()
-	add_compile_options("-Wall")
-endif()
-
-
 if (WIN32)
 	add_library(EposCmd SHARED IMPORTED)
 	set_target_properties(EposCmd PROPERTIES
@@ -50,14 +47,26 @@ else()
 	set(EposCmd-FOUND TRUE)
 endif()
 
+if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+	message("-- Creating coverage reports in Debug mode.")
+	add_compile_options(-coverage)
+	add_link_options(-coverage)
+endif()
+
 add_library(libtestrig SHARED ${LIBTESTRIG_SOURCES})
 target_compile_definitions(libtestrig PRIVATE COMPILING_TESTRIG_DLL)
 target_include_directories(libtestrig PUBLIC ${LIB_DIR})
 target_link_libraries(libtestrig PUBLIC EposCmd)
+target_compile_warn_all(libtestrig)
 target_output_to_bin(libtestrig)
+set_target_properties(libtestrig
+	PROPERTIES VERIFY_INTERFACE_HEADER_SETS ON)
 
 if (WIN32)
 	target_link_libraries(libtestrig PUBLIC Ws2_32 Kernel32)
 endif()
 
+add_library(vscl::testrig::lib ALIAS libtestrig)
+
 add_subdirectory("${CMAKE_SOURCE_DIR}/src")
+add_subdirectory("${CMAKE_SOURCE_DIR}/test")

CMakePresets.json

@@ -15,6 +15,7 @@
 				"CMAKE_COLOR_DIAGNOSTICS": "ON"
 			}
 		},
+
 		{
 			"name": "windows-only",
 			"hidden": true,

cmake/target_compile_warn_all.cmake

@@ -0,0 +1,7 @@
+function(target_compile_warn_all IN_TARGET_NAME)
+	if (MSVC)
+		target_compile_options(${IN_TARGET_NAME} PRIVATE "/W4")
+	else()
+		target_compile_options(${IN_TARGET_NAME} PRIVATE "-Wall")
+	endif()
+endfunction(target_compile_warn_all IN_TARGET_NAME)

lib/epos2/connect.c

@@ -7,7 +7,7 @@
 #include "identify.h"
 
 static void vscl_failed_open_device(uint32_t error_code) {
-	vscl_print_error(error_code);
+	vscl_rig_perror(error_code);
 	printf("Failed to open device with with following characteristics:\n");
 }
 
@@ -53,7 +53,7 @@ uint32_t vscl_initialize_devices(struct controller controllers_out[], void* hand
 	error_code = vscl_clean_enable_device(&controllers_out[0], handles_out[0]);
 	if (error_code != 0) {
 		printf("While attempting to open gateway:\n\t");
-		vscl_print_error(error_code);
+		vscl_rig_perror(error_code);
 
 		return error_code;
 	}
@@ -77,7 +77,7 @@ uint32_t vscl_initialize_devices(struct controller controllers_out[], void* hand
 		error_code = vscl_clean_enable_device(&controllers_out[i], handles_out[i]);
 		if (error_code != 0) {
 			printf("While attempting to open gateway:\n\t");
-			vscl_print_error(error_code);
+			vscl_rig_perror(error_code);
 			return error_code;
 		}
 	}
@@ -100,7 +100,7 @@ uint32_t vscl_clean_enable_device(struct controller* controller, void* device_ha
 	ret = VCS_ClearFault(device_handle, controller->node_id, &error_code);
 	if (ret == 0) {
 		printf("While clearing fault from %s at %s:\n\t", controller->name, controller->port);
-		vscl_print_error(error_code);
+		vscl_rig_perror(error_code);
 		return error_code;
 	}
 
@@ -125,7 +125,7 @@ uint32_t vscl_close_device(struct controller* controller, void* device_handle) {
 	if (ret == 0) {
 		printf("While attempting to close device %s at node %ihh\n\t",
 				controller->name, controller->node_id);
-		vscl_print_error(error_code);
+		vscl_rig_perror(error_code);
 		return error_code;
 	}
 
@@ -156,7 +156,7 @@ uint32_t vscl_close_devices(struct controller controllers[], void* device_handle
 		if (ret == 0) {
 			printf("While closing subdevice %s at node %ihh:\n\t",
 					controllers[i].name, controllers[i].node_id);
-			vscl_print_error(error_code);
+			vscl_rig_perror(error_code);
 
 			return error_code;
 		}
@@ -169,7 +169,7 @@ uint32_t vscl_close_devices(struct controller controllers[], void* device_handle
 	if (ret == 0) {
 		printf("While closing gateway device %s at node %ihh:\n\t",
 				controllers[0].name, controllers[0].node_id);
-		vscl_print_error(error_code);
+		vscl_rig_perror(error_code);
 		return error_code;
 	}
 

lib/epos2/epos2.c

@@ -11,7 +11,7 @@ int vscl_decode_error(const uint32_t error_code, char* error_msg, vscl_byte_t ma
 	return ret;
 }
 
-int vscl_print_error(const uint32_t error_code) {
+int vscl_rig_perror(const uint32_t error_code) {
 	char msg[64] = { 0 };
 	int ret = vscl_decode_error(error_code, msg, 64);
 	printf("ERROR 0x%X: %s\n", error_code, msg);
@@ -24,7 +24,7 @@ uint32_t vscl_reset_device(void *device_handle, struct controller* controller_in
 	uint32_t error_code = 0;
 	int ret = VCS_ResetDevice(device_handle, controller_in->node_id, &error_code);
 	if (ret == 0) {
-		vscl_print_error(error_code);
+		vscl_rig_perror(error_code);
 		printf("Device failed to be reset: %s\n", controller_in->name);
 	}
 
@@ -47,7 +47,7 @@ uint32_t vscl_setup_can_gateway(struct controller controllers[3], void* handles[
 	error_code = vscl_initialize_devices(controllers, handles, 3);
 	if (error_code != 0) {
 		printf("When initializing multiple devices: ");
-		vscl_print_error(error_code);
+		vscl_rig_perror(error_code);
 		return error_code;
 	}
 
@@ -60,7 +60,7 @@ uint32_t vscl_cleanup_testrig(struct controller controllers[3], void* handles[3]
 	error_code = vscl_close_devices(controllers, handles, 3);
 	if (error_code != 0) {
 		printf("When cleaning up multiple devices: ");
-		vscl_print_error(error_code);
+		vscl_rig_perror(error_code);
 		return error_code;
 	}
 

lib/epos2/epos2.h

@@ -22,7 +22,7 @@ int TESTRIG_API vscl_decode_error(const uint32_t error_code, char* error_msg, vs
 /*
  *	@brief Decode and print an error code's corresponding message.
  */
-int TESTRIG_API vscl_print_error(const uint32_t error_code);
+int TESTRIG_API vscl_rig_perror(const uint32_t error_code);
 
 /*
  *	@brief Reset a device.

lib/epos2/identify.c

@@ -7,23 +7,23 @@
 
 static void vscl_print_naming_error(vscl_byte_t error_code) {
 	printf("While identifying device names:\n\t");
-	vscl_print_error(error_code);
+	vscl_rig_perror(error_code);
 }
 
 static void vscl_print_protocol_ident_error(vscl_byte_t error_code, const char* name) {
 	printf("While identifying device protocol stacks for device %s:\n\t", name);
-	vscl_print_error(error_code);
+	vscl_rig_perror(error_code);
 }
 
 static void vscl_print_interface_ident_error(vscl_byte_t error_code, const char* name, const char* protocol) {
 	printf("While identifying device interface for device %s on protocol %s:\n\t", name, protocol);
-	vscl_print_error(error_code);
+	vscl_rig_perror(error_code);
 }
 
 static void vscl_print_port_ident_error(vscl_byte_t error_code, const char* name, const char* protocol, const char* iface) {
 	printf("While identifying device interface for device %s on protocol %s and interface %s:\n\t",
 			name, protocol, iface);
-	vscl_print_error(error_code);
+	vscl_rig_perror(error_code);
 }
 
 uint32_t vscl_ident_names(void) {

lib/epos2/manage.c

@@ -16,7 +16,7 @@ uint32_t vscl_abort(const struct controller* controller_in, void* device_handle)
 
 	int ret = VCS_SetQuickStopState(device_handle, controller_in->node_id, &error_code);
 	if (ret == 0) {
-		vscl_print_error(error_code);
+		vscl_rig_perror(error_code);
 		printf("DANGER: Failed to abort rig operations!\n");
 	}
 	else {