From f902303b208f0f3565d58dfe6acc197104ef9422 Mon Sep 17 00:00:00 2001 From: jason-watkins Date: Mon, 23 Mar 2015 16:10:50 -0700 Subject: [PATCH] Added Visual Studio solution for C test scripts and fixed test bug - Added a Visual Studio solution that builds the C test scripts on Windows. - Updated .gitignore to ignore user specific Visual Studio files - Updated .gitignore to ignore Windows build folders - Fixed a bug in closeTest. It now properly closes the UDP port a second time after reopening the port to verify that it closed successfully. --- .gitignore | 8 ++ TestScripts/C Tests.win/CTests.sln | 28 ++++ TestScripts/C Tests.win/CTests.vcxproj | 128 ++++++++++++++++++ .../C Tests.win/CTests.vcxproj.filters | 25 ++++ TestScripts/C Tests.win/CTests.vcxproj.user | 4 + TestScripts/C Tests/main.c | 3 +- 6 files changed, 195 insertions(+), 1 deletion(-) create mode 100644 TestScripts/C Tests.win/CTests.sln create mode 100644 TestScripts/C Tests.win/CTests.vcxproj create mode 100644 TestScripts/C Tests.win/CTests.vcxproj.filters create mode 100644 TestScripts/C Tests.win/CTests.vcxproj.user diff --git a/.gitignore b/.gitignore index d0c8220..e337f18 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,11 @@ xpcPlugin/Win/xpcPlugin64.lib xpcPlugin/Win/xpcPlugin64.exp xpcPlugin/xpcPlugin/xpcPlugin/Debug/xplaneConnect.obj xpcPlugin/xpcPlugin/xpcPlugin/Debug/xpcPluginTools.obj + +*.sdf +*.opensdf +*.suo +xpcPlugin/xpcPlugin/xpcPlugin/Debug +xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug +TestScripts/C Tests.win/Debug +TestScripts/C Tests.win/x64/Debug diff --git a/TestScripts/C Tests.win/CTests.sln b/TestScripts/C Tests.win/CTests.sln new file mode 100644 index 0000000..ec8f481 --- /dev/null +++ b/TestScripts/C Tests.win/CTests.sln @@ -0,0 +1,28 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CTests", "CTests.vcxproj", "{BC701AF4-552C-4C9D-82A1-B352542783A4}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {BC701AF4-552C-4C9D-82A1-B352542783A4}.Debug|Win32.ActiveCfg = Debug|Win32 + {BC701AF4-552C-4C9D-82A1-B352542783A4}.Debug|Win32.Build.0 = Debug|Win32 + {BC701AF4-552C-4C9D-82A1-B352542783A4}.Debug|x64.ActiveCfg = Debug|x64 + {BC701AF4-552C-4C9D-82A1-B352542783A4}.Debug|x64.Build.0 = Debug|x64 + {BC701AF4-552C-4C9D-82A1-B352542783A4}.Release|Win32.ActiveCfg = Release|Win32 + {BC701AF4-552C-4C9D-82A1-B352542783A4}.Release|Win32.Build.0 = Release|Win32 + {BC701AF4-552C-4C9D-82A1-B352542783A4}.Release|x64.ActiveCfg = Release|x64 + {BC701AF4-552C-4C9D-82A1-B352542783A4}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/TestScripts/C Tests.win/CTests.vcxproj b/TestScripts/C Tests.win/CTests.vcxproj new file mode 100644 index 0000000..9ba4d07 --- /dev/null +++ b/TestScripts/C Tests.win/CTests.vcxproj @@ -0,0 +1,128 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + + {BC701AF4-552C-4C9D-82A1-B352542783A4} + CTests + + + + Application + true + v120 + MultiByte + + + Application + true + v120 + MultiByte + + + Application + false + v120 + true + MultiByte + + + Application + false + v120 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + Level3 + Disabled + true + ../../C/src;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + + + true + + + + + Level3 + Disabled + true + ../../C/src;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + + + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + + \ No newline at end of file diff --git a/TestScripts/C Tests.win/CTests.vcxproj.filters b/TestScripts/C Tests.win/CTests.vcxproj.filters new file mode 100644 index 0000000..fae10d4 --- /dev/null +++ b/TestScripts/C Tests.win/CTests.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/TestScripts/C Tests.win/CTests.vcxproj.user b/TestScripts/C Tests.win/CTests.vcxproj.user new file mode 100644 index 0000000..ef5ff2a --- /dev/null +++ b/TestScripts/C Tests.win/CTests.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/TestScripts/C Tests/main.c b/TestScripts/C Tests/main.c index 019e8a2..8c8e4f8 100644 --- a/TestScripts/C Tests/main.c +++ b/TestScripts/C Tests/main.c @@ -44,7 +44,8 @@ short closeTest() // closeUDP test printf("closeUDP - "); struct xpcSocket sendPort = openUDP( 49063, "127.0.0.1", 49009 ); closeUDP(sendPort); - sendPort = openUDP( 49063, "127.0.0.1", 49009 ); + sendPort = openUDP(49063, "127.0.0.1", 49009); + closeUDP(sendPort); return 0; }