Forráskód Böngészése

Add shared test to Visual Studio and format script

bel 9 éve
szülő
commit
41331e29c6

+ 2 - 0
VS2012/unit_test/unit_test.vcxproj

@@ -17,6 +17,7 @@
     <ClInclude Include="..\..\test\private_exe.h" />
     <ClInclude Include="..\..\test\public_func.h" />
     <ClInclude Include="..\..\test\public_server.h" />
+    <ClInclude Include="..\..\test\shared.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\civetweb.c" />
@@ -26,6 +27,7 @@
     <ClCompile Include="..\..\test\private_exe.c" />
     <ClCompile Include="..\..\test\public_func.c" />
     <ClCompile Include="..\..\test\public_server.c" />
+    <ClCompile Include="..\..\test\shared.c" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1AC4A7A6-0100-4287-97F4-B95807BE5607}</ProjectGuid>

+ 12 - 6
VS2012/unit_test/unit_test.vcxproj.filters

@@ -15,12 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\test\civetweb_check.h">
-      <Filter>Quelldateien</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\test\private.h">
-      <Filter>Quelldateien</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\civetweb.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
@@ -33,6 +27,15 @@
     <ClInclude Include="..\..\test\private_exe.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\test\private.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\test\shared.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\test\civetweb_check.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\test\public_server.c">
@@ -50,5 +53,8 @@
     <ClCompile Include="..\..\test\private_exe.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\test\shared.c">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

+ 2 - 0
format.bat

@@ -19,6 +19,8 @@ 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/shared.h
+clang-format -i test/shared.c
 clang-format -i test/civetweb_check.h
 clang-format -i test/main.c
 

+ 15 - 5
test/shared.c

@@ -19,15 +19,25 @@
  * THE SOFTWARE.
  */
 
+
+#if !defined(_CRT_SECURE_NO_WARNINGS)
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+#if !defined(_CRT_SECURE_NO_DEPRECATE)
+#define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+
 #include "shared.h"
 #include <string.h>
 
 static char s_test_directory[1024] = {'\0'};
 
-const char * get_test_directory(void) {
-  return s_test_directory;
-}
+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]));
+void set_test_directory(const char *const path)
+{
+	strncpy(s_test_directory,
+	        path,
+	        sizeof(s_test_directory) / sizeof(s_test_directory[0]));
 }

+ 4 - 2
test/shared.h

@@ -21,7 +21,9 @@
 #ifndef TEST_SHARED_H_
 #define TEST_SHARED_H_
 
-const char * get_test_directory(void);
-void set_test_directory(const char * const path);
+
+const char *get_test_directory(void);
+void set_test_directory(const char *const path);
+
 
 #endif /* TEST_SHARED_H_ */