Fix command-line argument test builds

Author: tragisch

src/unity.c

@@ -2404,7 +2404,7 @@ void UnityPopDetail(UNITY_DETAIL_LABEL_TYPE label, UNITY_DETAIL_VALUE_TYPE value
  *-----------------------------------------------*/
 #ifdef UNITY_USE_COMMAND_LINE_ARGS
 
-char* UnityOptionIncludeNamed = NULL;
+const char* UnityOptionIncludeNamed = NULL;
 char* UnityOptionExcludeNamed = NULL;
 int UnityVerbosity            = 1;
 int UnityStrictMatch          = 0;
@@ -2426,7 +2426,7 @@ extern char* getenv(const char* name);
     testbridge_filter = UNITY_GETENV("TESTBRIDGE_TEST_ONLY");
     if (testbridge_filter && testbridge_filter[0] != 0)
     {
-        UnityOptionIncludeNamed = (char*)testbridge_filter;
+        UnityOptionIncludeNamed = testbridge_filter;
     }
 
     for (i = 1; i < argc; i++)

test/Makefile

@@ -22,6 +22,7 @@ CFLAGS += -Wbad-function-cast -Wcast-qual -Wold-style-definition -Wshadow -Wstri
 CFLAGS += $(DEBUG)
 UNITY_SUPPORT_64 = -D UNITY_SUPPORT_64
 UNITY_INCLUDE_DOUBLE = -D UNITY_INCLUDE_DOUBLE
+UNITY_USE_COMMAND_LINE_ARGS = -D UNITY_USE_COMMAND_LINE_ARGS
 DEFINES =  -D UNITY_OUTPUT_CHAR=putcharSpy
 DEFINES += -D UNITY_OUTPUT_CHAR_HEADER_DECLARATION=putcharSpy\(int\)
 DEFINES += -D UNITY_OUTPUT_FLUSH=flushSpy
@@ -53,7 +54,7 @@ coverage: $(SRC1) $(SRC2) $(SRC3) $(SRC4) $(SRC5) $(SRC6) $(SRC7) $(SRC8)
 	gcov unity.c | head -3
 	grep '###' $(BUILD_DIR)/unity.c.gcov -C2 || true
 	cd $(BUILD_DIR) && \
-	$(CC) $(CFLAGS) $(DEFINES) $(foreach i,$(SRC2), ../$i) $(COV_FLAGS) -o ../$(TARGET)
+	$(CC) $(CFLAGS) $(DEFINES) $(UNITY_USE_COMMAND_LINE_ARGS) $(foreach i,$(SRC2), ../$i) $(COV_FLAGS) -o ../$(TARGET)
 	rm -f $(BUILD_DIR)/*.gcda
 	./$(TARGET) | grep 'Tests\|]]]' -A1
 	cd $(BUILD_DIR) && \
@@ -105,7 +106,7 @@ coverage: $(SRC1) $(SRC2) $(SRC3) $(SRC4) $(SRC5) $(SRC6) $(SRC7) $(SRC8)
 test: $(SRC1) $(SRC2) $(SRC3) $(SRC4) $(SRC5) $(SRC6) $(SRC7) $(SRC8)
 	$(CC) $(CFLAGS) $(DEFINES) $(INC_DIR) $(SRC1) -o $(TARGET)
 	./$(TARGET)
-	$(CC) $(CFLAGS) $(DEFINES) $(INC_DIR) $(SRC2) -o $(TARGET)
+	$(CC) $(CFLAGS) $(DEFINES) $(UNITY_USE_COMMAND_LINE_ARGS) $(INC_DIR) $(SRC2) -o $(TARGET)
 	./$(TARGET)
 	$(CC) $(CFLAGS) $(DEFINES) $(INC_DIR) $(SRC3) -o $(TARGET)
 	./$(TARGET)

test/rakefile_helper.rb

@@ -310,7 +310,7 @@ def run_tests(test_files)
 
       report "\nRunning Tests in #{test}"
       obj_list = []
-      test_defines = []
+      test_defines = File.basename(test) == 'test_unity_core.c' ? ['UNITY_USE_COMMAND_LINE_ARGS'] : []
 
       # Detect dependencies and build required modules
       extract_headers(test).each do |header|

test/tests/test_unity_core.c

@@ -5,6 +5,10 @@
     SPDX-License-Identifier: MIT
 ========================================================================= */
 
+#if defined(UNITY_USE_COMMAND_LINE_ARGS) && !defined(_WIN32) && !defined(_MSC_VER) && !defined(_POSIX_C_SOURCE)
+#define _POSIX_C_SOURCE 200112L
+#endif
+
 #include "unity.h"
 #ifdef UNITY_USE_COMMAND_LINE_ARGS
 #include "unity_internals.h"
@@ -226,6 +230,8 @@ static void UnitySetTestContext(const char* testfile, const char* testname)
 void testUnityParseOptionsUsesTestbridgeFilter(void)
 {
     char* argv[] = { (char*)"prog", NULL };
+    const char* testfile = Unity.TestFile;
+    const char* testname = Unity.CurrentTestName;
 
     UnitySetTestbridgeFilter("test_my_function");
     UnityParseOptions(1, argv);
@@ -236,11 +242,15 @@ void testUnityParseOptionsUsesTestbridgeFilter(void)
     TEST_ASSERT_FALSE(UnityTestMatches());
 
     UnitySetTestbridgeFilter(NULL);
+    UnityParseOptions(1, argv);
+    UnitySetTestContext(testfile, testname);
 }
 
 void testUnityParseOptionsArgsOverrideTestbridgeFilter(void)
 {
     char* argv[] = { (char*)"prog", (char*)"-n", (char*)"other", NULL };
+    const char* testfile = Unity.TestFile;
+    const char* testname = Unity.CurrentTestName;
 
     UnitySetTestbridgeFilter("test_my_function");
     UnityParseOptions(3, argv);
@@ -251,6 +261,8 @@ void testUnityParseOptionsArgsOverrideTestbridgeFilter(void)
     TEST_ASSERT_FALSE(UnityTestMatches());
 
     UnitySetTestbridgeFilter(NULL);
+    UnityParseOptions(1, argv);
+    UnitySetTestContext(testfile, testname);
 }
 #endif