Added More Stubs For ThreadX (#347)

Author: caiodasilva2005

Testing/Makefile

@@ -19,6 +19,7 @@ TEST_FILE ?=
 TEST_PACKAGE ?=
 C_SOURCES ?=
 INCLUDE_DIRS ?=
+C_DEFINES ?=
 
 TEST_BUILD_OBJS := $(TEST_BUILD)/objs/$(TEST_PACKAGE)
 
@@ -41,14 +42,13 @@ TARGET := $(TEST_BUILD_BIN)/$(TEST_NAME)
 
 # Include dirs
 C_INCLUDES := \
-	-I$(EMEBEDDED_TESTING_DIR)/manual_mocks \
 	-I$(UNITY_SRC) \
  	-I$(CMOCK_SRC) \
 	$(addprefix -I,$(INCLUDE_DIRS)) \
 	-I$(MOCKS_DIR)/$(TEST_PACKAGE) \
 	-I$(TEST_DIR)/Inc 
 
-CFLAGS = -w -DTESTING $(C_INCLUDES)
+CFLAGS = -w $(C_DEFINES) $(C_INCLUDES)
 
 TEST_SOURCES = $(CMOCK_SRC)/cmock.c $(UNITY_SRC)/unity.c
 

Testing/manual_mocks/stubs.h

@@ -7,7 +7,6 @@
 
 EMBEDDED_BASE_PATH = "Drivers/Embedded-Base/"
 EMBEDDED_BASE_TESTING_DIR_PATH = EMBEDDED_BASE_PATH + "Testing/"
-MOCK_STUBS_FILEPATH = EMBEDDED_BASE_TESTING_DIR_PATH + "manual_mocks/mock_stubs.h" 
 BUILD_DIR = EMBEDDED_BASE_TESTING_DIR_PATH + "build"
 CMAKE_TOOLCHAIN_FILEPATH = EMBEDDED_BASE_TESTING_DIR_PATH + "test-toolchain.cmake"
 PROJECT_TEST_DIR_PATH =  "Tests/"
@@ -16,7 +15,7 @@
 TEST_CONF_PATH = PROJECT_TEST_DIR_PATH + "ner_test.conf"
 CMOCK_RUBY_SCRIPT_PATH = "/cmock_portable/lib/cmock.rb"
 EMBEDDED_BASE_CMOCK_CONFIG = EMBEDDED_BASE_TESTING_DIR_PATH + "cmock-config.yml"
-PROJECT_CMOCK_CONFIG = PROJECT_TEST_DIR_PATH + "cmock-config.yml"
+PROJECT_CMOCK_CONFIG = PROJECT_TEST_DIR_PATH + "cmock-config.yml" 
 
 data = {}
 with open("Tests/ner_test.conf", "rb") as f:
@@ -99,7 +98,7 @@ def create_mocks(selected_test_packages):
 
 
 
-def build_test(test_name, test_file, test_package, source_files):
+def build_test(test_name, test_file, test_package, source_files, c_defines):
 
     print("BUILDING TEST: " + test_name)
 
@@ -112,6 +111,7 @@ def build_test(test_name, test_file, test_package, source_files):
     TEST_FILE={test_file} \
     TEST_PACKAGE={test_package} \
     C_SOURCES="{joined_sources}" \
+    C_DEFINES="{c_defines}" \
     INCLUDE_DIRS="{joined_include_dirs}"
     """
 
@@ -134,13 +134,23 @@ def get_selected_test_packages(selected_tests):
 
     return selected_test_packages
 
+def get_formatted_defines():
+    c_defines = data.get("defines", [])
+    formatted_defines = []
+    for cd in c_defines:
+        formatted_defines.append("-D" + cd)
+    
+    return " ".join(formatted_defines)
+
+
 def build_tests(selected_tests):
+    c_defines = get_formatted_defines()
     for t_name in selected_tests:
         t_data = tests[t_name]
         test_package = t_data["test-package"]
         test_file = t_data["test-file"]
         sources = get_project_sources(test_package)
-        process = build_test(t_name, test_file, test_package, sources)
+        process = build_test(t_name, test_file, test_package, sources, c_defines)
         retcode = process.wait()
         if (retcode != 0):
             return retcode
@@ -187,5 +197,6 @@ def main():
         return ret
 
 if __name__ == "__main__":
-    main()
+    ret = main()
+    sys.exit(ret)
 

ner_environment/build_system/test_runner.py

@@ -7,17 +7,17 @@ TX_EVENT_FLAGS_GROUP event_flags;
 uint8_t flags_init()
 {
 	if (tx_event_flags_create(&event_flags, "Thread Flags")) {
-		DEBUG_PRINTLN("Failed to initialize flag event groups.");
+		PRINTLN_INFO("Failed to initialize flag event groups.");
 		return U_ERROR;
 	}
-	DEBUG_PRINTLN("Ran flags_init().");
+	PRINTLN_INFO("Ran flags_init().");
 	return U_SUCCESS;
 }
 
 uint8_t set_flag(ULONG flag)
 {
 	if (tx_event_flags_set(&event_flags, flag, TX_OR)) {
-		DEBUG_PRINTLN("Failed to set flag %d.", flag);
+		PRINTLN_INFO("Failed to set flag %d.", flag);
 		return U_ERROR;
 	}
 	return U_SUCCESS;
@@ -28,7 +28,7 @@ uint8_t get_flag(ULONG flag, ULONG timeout)
 	ULONG result_flags;
 	if (tx_event_flags_get(&event_flags, flag, TX_OR_CLEAR, &result_flags,
 				timeout)) {
-		DEBUG_PRINTLN("Failed to get flag %d.", flag);
+		PRINTLN_INFO("Failed to get flag %d.", flag);
 		return U_ERROR;
 	}
 	return U_SUCCESS;