Method to get the current testing directory

This is useful to find the testing directory of the project during the
check tests so that fixtures and expected results can be read

test/CMakeLists.txt

@@ -53,6 +53,10 @@ if (LIBRT_FOUND)
 endif()
 
 # Build the C unit tests
+add_library(shared-c-unit-tests STATIC shared.c)
+target_include_directories(
+  shared-c-unit-tests PUBLIC
+  ${PROJECT_SOURCE_DIR}/include)
 add_library(public-c-unit-tests STATIC public.c)
 if (BUILD_SHARED_LIBS)
   target_compile_definitions(public-c-unit-tests PRIVATE CIVETWEB_DLL_IMPORTS)
@@ -69,7 +73,11 @@ target_include_directories(
 target_link_libraries(private-c-unit-tests ${CHECK_LIBRARIES})
 add_dependencies(private-c-unit-tests check-unit-test-framework)
 add_executable(civetweb-c-unit-test main.c)
-target_link_libraries(civetweb-c-unit-test public-c-unit-tests private-c-unit-tests ${CHECK_LIBRARIES})
+target_link_libraries(civetweb-c-unit-test
+  shared-c-unit-tests
+  public-c-unit-tests
+  private-c-unit-tests
+  ${CHECK_LIBRARIES})
 add_dependencies(civetweb-c-unit-test check-unit-test-framework)
 
 # Add a check command that builds the dependent test program
@@ -84,7 +92,7 @@ macro(civetweb_add_test suite test_case)
   string(REGEX REPLACE "[^-A-Za-z0-9]" "-" test "${test}")
   add_test(
     NAME ${test}
-    COMMAND civetweb-c-unit-test "--suite=${suite}" "--test-case=${test_case}")
+    COMMAND civetweb-c-unit-test "--test-dir=${CMAKE_CURRENT_SOURCE_DIR}" "--suite=${suite}" "--test-case=${test_case}")
   if (WIN32)
     string(REPLACE ";" "\\;" test_path "$ENV{PATH}")
     set_tests_properties(${test} PROPERTIES

test/main.c

@@ -20,6 +20,7 @@
  */
 
 #include "civetweb_check.h"
+#include "shared.h"
 #include "public.h"
 #include "private.h"
 
@@ -40,15 +41,21 @@ int main(const int argc, const char * const * const argv) {
   const char * test_case = NULL;
   const char * const test_case_arg = "--test-case=";
   const size_t test_case_arg_size = strlen(test_case_arg);
+  const char * const test_dir_arg = "--test-dir=";
+  const size_t test_dir_arg_size = strlen(test_dir_arg);
   for (int i = 1; i < argc; ++i) {
     if (0 == strncmp(suite_arg, argv[i], suite_arg_size) && (strlen(argv[i]) > suite_arg_size)) {
       suite = &argv[i][suite_arg_size];
     } else if (0 == strncmp(test_case_arg, argv[i], test_case_arg_size) && (strlen(argv[i]) > test_case_arg_size)) {
       test_case = &argv[i][test_case_arg_size];
+    } else if (0 == strncmp(test_dir_arg, argv[i], test_dir_arg_size) && (strlen(argv[i]) > test_dir_arg_size)) {
+      set_test_directory(&argv[i][test_dir_arg_size]);
     } else if (0 == strcmp("--help", argv[i])) {
       printf("Usage: %s [options]\n"
         "  --suite=Suite            Determines the suite to run\n"
-        "  --test-case='Test Case'  Determines the test case to run\n",
+        "  --test-case='Test Case'  Determines the test case to run\n"
+        "  --test-dir='folder/path' The location of the test directory with the \n"
+        "                           'fixtures' and 'expected\n",
         argv[0]);
       exit(EXIT_SUCCESS);
     } else {

test/shared.c

@@ -0,0 +1,33 @@
+/* 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.
+ */
+
+#include "shared.h"
+#include <string.h>
+
+static char s_test_directory[1024] = {'\0'};
+
+const char * get_test_directory(void) {
+  return s_test_directory;
+}
+
+void set_test_directory(const char * const path) {
+  strncpy(s_test_directory, path, sizeof(s_test_directory)/sizeof(s_test_directory[0]));
+}

test/shared.h

@@ -0,0 +1,27 @@
+/* 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_SHARED_H_
+#define TEST_SHARED_H_
+
+const char * get_test_directory(void);
+void set_test_directory(const char * const path);
+
+#endif /* TEST_SHARED_H_ */