Add unit test for main.c

format.bat

@@ -17,4 +17,6 @@ clang-format -i test/public_server.h
 clang-format -i test/public_server.c
 clang-format -i test/private.h
 clang-format -i test/private.c
+clang-format -i test/private_exe.h
+clang-format -i test/private_exe.c
 clang-format -i test/civetweb_check.h

test/CMakeLists.txt

@@ -85,12 +85,23 @@ target_include_directories(
 target_link_libraries(private-c-unit-tests ${CHECK_LIBRARIES})
 add_dependencies(private-c-unit-tests check-unit-test-framework)
 
+add_library(exe-unit-tests STATIC private_exe.c)
+if (BUILD_SHARED_LIBS)
+  target_compile_definitions(exe-unit-tests PRIVATE)
+endif()
+target_include_directories(
+  exe-unit-tests PUBLIC
+  ${PROJECT_SOURCE_DIR}/include)
+target_link_libraries(exe-unit-tests c-library ${CHECK_LIBRARIES})
+add_dependencies(exe-unit-tests check-unit-test-framework)
+
 add_executable(civetweb-c-unit-test main.c)
 target_link_libraries(civetweb-c-unit-test
   shared-c-unit-tests
   public-func-c-unit-tests
   public-server-c-unit-tests
   private-c-unit-tests
+  exe-unit-tests
   ${CHECK_LIBRARIES})
 add_dependencies(civetweb-c-unit-test check-unit-test-framework)
 
@@ -137,6 +148,9 @@ civetweb_add_test(PublicServer "Start Stop HTTP Server")
 civetweb_add_test(PublicServer "Start Stop HTTPS Server")
 civetweb_add_test(PublicServer "Server Requests")
 
+# Tests with main.c
+civetweb_add_test(EXE "Helper funcs")
+
 
 # Add the coverage command(s)
 if (${CMAKE_BUILD_TYPE} MATCHES "[Cc]overage")

test/private_exe.c

@@ -0,0 +1,67 @@
+/* Copyright (c) 2015 the Civetweb developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * We include the source file so that we have access to the internal private
+ * static functions.
+ */
+#ifdef _MSC_VER
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+#define printf DO_NOT_USE_PRINTF
+#include "../src/main.c"
+
+#include <stdlib.h>
+
+#include "private_exe.h"
+
+/* This unit test file uses the excellent Check unit testing library.
+ * The API documentation is available here:
+ * http://check.sourceforge.net/doc/check_html/index.html
+ */
+
+START_TEST(test_helper_funcs)
+{
+    const char *psrc = "test str";
+	char *pdst;
+
+    /* test sdup */
+    pdst = sdup(psrc);
+    ck_assert(pdst != NULL);
+    ck_assert_str_eq(pdst, psrc);
+	ck_assert_ptr_ne(pdst, psrc);
+    free(pdst);
+}
+END_TEST
+
+
+Suite *make_private_exe_suite(void)
+{
+	Suite *const suite = suite_create("EXE");
+
+	TCase *const helper_funcs = tcase_create("Helper funcs");
+
+	tcase_add_test(helper_funcs, test_helper_funcs);
+	tcase_set_timeout(helper_funcs, civetweb_min_test_timeout);
+	suite_add_tcase(suite, encode_decode);
+
+	return suite;
+}

test/private_exe.h

@@ -0,0 +1,28 @@
+/* Copyright (c) 2015 the Civetweb developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef TEST_PRIVATE_H_
+#define TEST_PRIVATE_H_
+
+#include "civetweb_check.h"
+
+Suite *make_private_exe_suite(void);
+
+#endif /* TEST_PRIVATE_H_ */