Added project files for check and unit tests, fixed check adaption to win32

This commit is contained in:
goldsimon 2010-02-09 16:41:27 +00:00
parent 540bac6fa3
commit a70c0fb424
6 changed files with 545 additions and 2 deletions

View File

@ -8,5 +8,14 @@ typedef unsigned int uint32_t;
#define HAVE_DECL_STRDUP 1
#define HAVE_DECL_FILENO 1
#define HAVE_DECL_PUTENV 1
#define _CRT_SECURE_NO_WARNINGS
// disable some warnings
#pragma warning (disable: 4090) /* const assigned to non-const */
#pragma warning (disable: 4996) /* fileno is deprecated */
#define LWIP_UNITTESTS_NOFORK
#include <io.h>

View File

@ -6,7 +6,9 @@
#else
#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL
#endif
#include "config.h"
struct timezone
{
int tz_minuteswest; /* minutes W of Greenwich */
@ -48,4 +50,15 @@ int gettimeofday(struct timeval *tv, struct timezone *tz)
return 0;
}
struct tm *
localtime_r(const time_t *timer, struct tm *result)
{
struct tm *local_result;
local_result = localtime (timer);
if (local_result == NULL || result == NULL)
return NULL;
memcpy (result, local_result, sizeof (result));
return result;
}

View File

@ -0,0 +1,258 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="(,00"
Name="libcheck"
ProjectGUID="{EBB156DC-01BF-47B2-B69C-1A750B6B5F09}"
RootNamespace="libcheck"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\check;..\..\..\..\check\src"
PreprocessorDefinitions="HAVE_CONFIG_H"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\check;..\..\..\..\check\src"
PreprocessorDefinitions="HAVE_CONFIG_H"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Win32"
>
<File
RelativePath="..\check\config.h"
>
</File>
<File
RelativePath="..\check\time.c"
>
</File>
<File
RelativePath="..\check\unistd.h"
>
</File>
<Filter
Name="sys"
>
<File
RelativePath="..\check\sys\time.h"
>
</File>
</Filter>
</Filter>
<Filter
Name="src"
>
<File
RelativePath="..\..\..\..\check\src\check.c"
>
</File>
<File
RelativePath="..\..\..\..\check\src\check.h"
>
</File>
<File
RelativePath="..\..\..\..\check\src\check_error.c"
>
</File>
<File
RelativePath="..\..\..\..\check\src\check_error.h"
>
</File>
<File
RelativePath="..\..\..\..\check\src\check_impl.h"
>
</File>
<File
RelativePath="..\..\..\..\check\src\check_list.c"
>
</File>
<File
RelativePath="..\..\..\..\check\src\check_list.h"
>
</File>
<File
RelativePath="..\..\..\..\check\src\check_log.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\check\src\check_log.h"
>
</File>
<File
RelativePath="..\..\..\..\check\src\check_msg.c"
>
</File>
<File
RelativePath="..\..\..\..\check\src\check_msg.h"
>
</File>
<File
RelativePath="..\..\..\..\check\src\check_pack.c"
>
</File>
<File
RelativePath="..\..\..\..\check\src\check_pack.h"
>
</File>
<File
RelativePath="..\..\..\..\check\src\check_print.c"
>
</File>
<File
RelativePath="..\..\..\..\check\src\check_print.h"
>
</File>
<File
RelativePath="..\..\..\..\check\src\check_run.c"
>
</File>
<File
RelativePath="..\..\..\..\check\src\check_str.c"
>
</File>
<File
RelativePath="..\..\..\..\check\src\check_str.h"
>
</File>
</Filter>
<Filter
Name="libcompat"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@ -0,0 +1,35 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwIP", "lwIP.vcproj", "{2CC276FA-B226-49C9-8F82-7FCD5A228E28}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcheck", "libcheck.vcproj", "{EBB156DC-01BF-47B2-B69C-1A750B6B5F09}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwip_unittests", "lwip_unittests.vcproj", "{6CCABAA4-F86F-4119-AFF8-43C9A4A234C2}"
ProjectSection(ProjectDependencies) = postProject
{EBB156DC-01BF-47B2-B69C-1A750B6B5F09} = {EBB156DC-01BF-47B2-B69C-1A750B6B5F09}
{2CC276FA-B226-49C9-8F82-7FCD5A228E28} = {2CC276FA-B226-49C9-8F82-7FCD5A228E28}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug|Win32.ActiveCfg = Debug|Win32
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Debug|Win32.Build.0 = Debug|Win32
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release|Win32.ActiveCfg = Release|Win32
{2CC276FA-B226-49C9-8F82-7FCD5A228E28}.Release|Win32.Build.0 = Release|Win32
{EBB156DC-01BF-47B2-B69C-1A750B6B5F09}.Debug|Win32.ActiveCfg = Debug|Win32
{EBB156DC-01BF-47B2-B69C-1A750B6B5F09}.Debug|Win32.Build.0 = Debug|Win32
{EBB156DC-01BF-47B2-B69C-1A750B6B5F09}.Release|Win32.ActiveCfg = Release|Win32
{EBB156DC-01BF-47B2-B69C-1A750B6B5F09}.Release|Win32.Build.0 = Release|Win32
{6CCABAA4-F86F-4119-AFF8-43C9A4A234C2}.Debug|Win32.ActiveCfg = Debug|Win32
{6CCABAA4-F86F-4119-AFF8-43C9A4A234C2}.Debug|Win32.Build.0 = Debug|Win32
{6CCABAA4-F86F-4119-AFF8-43C9A4A234C2}.Release|Win32.ActiveCfg = Release|Win32
{6CCABAA4-F86F-4119-AFF8-43C9A4A234C2}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View File

@ -0,0 +1,224 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="lwip_unittests"
ProjectGUID="{6CCABAA4-F86F-4119-AFF8-43C9A4A234C2}"
RootNamespace="lwip_unittests"
TargetFrameworkVersion="196613"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\check;..\..\..\..\check\src;$(LWIP_DIR)\src\include,$(LWIP_DIR)\src\include\ipv4,..\include,.."
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
WarningLevel="4"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
GenerateDebugInformation="true"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\check;..\..\..\..\check\src;$(LWIP_DIR)\src\include,$(LWIP_DIR)\src\include\ipv4,..\include,.."
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="4"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
GenerateDebugInformation="true"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="core"
>
<File
RelativePath="..\..\..\..\lwip\test\unit\core\test_mem.c"
>
</File>
<File
RelativePath="..\..\..\..\lwip\test\unit\core\test_mem.h"
>
</File>
</Filter>
<Filter
Name="tcp"
>
<File
RelativePath="..\..\..\..\lwip\test\unit\tcp\tcp_helper.c"
>
</File>
<File
RelativePath="..\..\..\..\lwip\test\unit\tcp\tcp_helper.h"
>
</File>
<File
RelativePath="..\..\..\..\lwip\test\unit\tcp\test_tcp.c"
>
</File>
<File
RelativePath="..\..\..\..\lwip\test\unit\tcp\test_tcp.h"
>
</File>
<File
RelativePath="..\..\..\..\lwip\test\unit\tcp\test_tcp_oos.c"
>
</File>
<File
RelativePath="..\..\..\..\lwip\test\unit\tcp\test_tcp_oos.h"
>
</File>
</Filter>
<Filter
Name="udp"
>
<File
RelativePath="..\..\..\..\lwip\test\unit\udp\test_udp.c"
>
</File>
<File
RelativePath="..\..\..\..\lwip\test\unit\udp\test_udp.h"
>
</File>
</Filter>
<File
RelativePath="..\..\..\..\lwip\test\unit\lwip_check.h"
>
</File>
<File
RelativePath="..\..\..\..\lwip\test\unit\lwip_unittests.c"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@ -23,3 +23,7 @@ using the winpcap library.
lwIP: http://savannah.nongnu.org/projects/lwip/
WinPCap: http://netgroup-serv.polito.it/winpcap/
To compile the unittests, download check (tested with v0.9.8) from
http://sourceforge.net/projects/check/
and place it in a folder "check" next to the "contrib" folder.