Remove the test part from the vs2010 projects
This commit is contained in:
Frank Denis
parent
81f3f64f42
commit
59f0300c0e
@ -1,43 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<_PropertySheetDisplayName>Libsodium Test Common Settings</_PropertySheetDisplayName>
|
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
|
||||||
<RunCodeAnalysis>false</RunCodeAnalysis>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<!-- Configuration -->
|
|
||||||
|
|
||||||
<ItemDefinitionGroup>
|
|
||||||
<ClCompile>
|
|
||||||
<AdditionalIncludeDirectories>$(RepoRoot)test\default\;$(RepoRoot)test\quirks\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
||||||
<EnablePREfast>false</EnablePREfast>
|
|
||||||
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<!--<PreprocessorDefinitions>NATIVE_LITTLE_ENDIAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
|
|
||||||
</ClCompile>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
|
|
||||||
<!-- Dependencies -->
|
|
||||||
|
|
||||||
<ImportGroup Label="PropertySheets">
|
|
||||||
<Import Project="$(SolutionDir)libsodium.import.props" />
|
|
||||||
</ImportGroup>
|
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
|
|
||||||
<Linkage-libsodium>dynamic</Linkage-libsodium>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
|
|
||||||
<Linkage-libsodium>ltcg</Linkage-libsodium>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
|
|
||||||
<Linkage-libsodium>static</Linkage-libsodium>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<!-- Messages -->
|
|
||||||
|
|
||||||
<Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
|
|
||||||
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
|
|
||||||
</Target>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
@ -1,78 +0,0 @@
|
|||||||
REM WORK IN PROGRESS
|
|
||||||
|
|
||||||
@ECHO OFF
|
|
||||||
|
|
||||||
if "%1" == "" (
|
|
||||||
echo "Usage: wintest.bat <DebugDLL | ReleaseDLL | DebugLIB | ReleaseLIB | DebugLTCG | DebugLTCG"
|
|
||||||
goto :END
|
|
||||||
)
|
|
||||||
|
|
||||||
if "%2" == "x64" (SET ARCH=x64) else (SET ARCH=Win32)
|
|
||||||
SET CFLAGS=/nologo /DTEST_SRCDIR=\".\" /I..\..\src\libsodium\include\sodium /I..\..\src\libsodium\include /I..\quirks
|
|
||||||
SET LDFLAGS=/link /LTCG advapi32.lib ..\..\Build\%1\%ARCH%\libsodium.lib
|
|
||||||
|
|
||||||
if not "%3" == "" (
|
|
||||||
CD %3
|
|
||||||
)
|
|
||||||
|
|
||||||
if not exist sodium_version.c (
|
|
||||||
if not exist sodium_version.c (
|
|
||||||
echo "Are you on the right path?" %CD%
|
|
||||||
goto :END
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
if "%1" == "DebugDLL" ( goto :DebugDLL )
|
|
||||||
if "%1" == "ReleaseDLL" ( goto :ReleaseDLL )
|
|
||||||
|
|
||||||
if "%1" == "DebugLIB" ( goto :DebugLIB )
|
|
||||||
if "%1" == "ReleaseLIB" ( goto :ReleaseLIB )
|
|
||||||
|
|
||||||
if "%1" == "DebugLTCG" ( goto :DebugLTCG )
|
|
||||||
if "%1" == "ReleaseLTCG" ( goto :ReleaseLTCG )
|
|
||||||
|
|
||||||
echo "Invalid build type"
|
|
||||||
goto :END
|
|
||||||
|
|
||||||
:DebugDLL
|
|
||||||
SET CFLAGS=%CFLAGS% /GS /MDd /Od
|
|
||||||
SET PATH=..\..\Build\%1\%ARCH%;%PATH%
|
|
||||||
goto :COMPILE
|
|
||||||
:ReleaseDLL
|
|
||||||
SET CFLAGS=%CFLAGS% /MD /Ox
|
|
||||||
SET PATH=..\..\Build\%1\%ARCH%;%PATH%
|
|
||||||
goto :COMPILE
|
|
||||||
|
|
||||||
:DebugLIB
|
|
||||||
SET CFLAGS=%CFLAGS% /GS /MTd /Od /DSODIUM_STATIC
|
|
||||||
goto :COMPILE
|
|
||||||
:ReleaseLIB
|
|
||||||
SET CFLAGS=%CFLAGS% /MT /Ox /DSODIUM_STATIC
|
|
||||||
goto :COMPILE
|
|
||||||
|
|
||||||
:DebugLTCG
|
|
||||||
SET CFLAGS=%CFLAGS% /LTCG /GS /MTd /Od /DSODIUM_STATIC
|
|
||||||
goto :COMPILE
|
|
||||||
:ReleaseLTCG
|
|
||||||
SET CFLAGS=%CFLAGS% /LTCG /MT /Ox /DSODIUM_STATIC
|
|
||||||
goto :COMPILE
|
|
||||||
|
|
||||||
:COMPILE
|
|
||||||
echo Running the test suite:
|
|
||||||
FOR %%f in (*.c) DO (
|
|
||||||
cl %CFLAGS% %%f %LDFLAGS% /errorReport:prompt /OUT:%%f.exe > NUL 2>&1
|
|
||||||
if not exist %%f.exe (
|
|
||||||
echo %%f compile failed
|
|
||||||
goto :END
|
|
||||||
)
|
|
||||||
%%f.exe
|
|
||||||
if errorlevel 1 (
|
|
||||||
echo %%f failed
|
|
||||||
) else (
|
|
||||||
echo %%f ok
|
|
||||||
)
|
|
||||||
)
|
|
||||||
REM Remove temporary files
|
|
||||||
del *.exe *.obj *.res *.exp *.pdb
|
|
||||||
|
|
||||||
:END
|
|
||||||
@ -1,71 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{4EDBA07C-2F08-4C9E-805F-A4921814C117}</ProjectGuid>
|
|
||||||
<ProjectName>test</ProjectName>
|
|
||||||
<PlatformToolset>v100</PlatformToolset>
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup Label="ProjectConfigurations">
|
|
||||||
<ProjectConfiguration Include="DebugDEXE|Win32">
|
|
||||||
<Configuration>DebugDEXE</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="ReleaseDEXE|Win32">
|
|
||||||
<Configuration>ReleaseDEXE</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="DebugDEXE|x64">
|
|
||||||
<Configuration>DebugDEXE</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="ReleaseDEXE|x64">
|
|
||||||
<Configuration>ReleaseDEXE</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="DebugLEXE|Win32">
|
|
||||||
<Configuration>DebugLEXE</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="ReleaseLEXE|Win32">
|
|
||||||
<Configuration>ReleaseLEXE</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="DebugLEXE|x64">
|
|
||||||
<Configuration>DebugLEXE</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="ReleaseLEXE|x64">
|
|
||||||
<Configuration>ReleaseLEXE</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="DebugSEXE|Win32">
|
|
||||||
<Configuration>DebugSEXE</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="ReleaseSEXE|Win32">
|
|
||||||
<Configuration>ReleaseSEXE</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="DebugSEXE|x64">
|
|
||||||
<Configuration>DebugSEXE</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
<ProjectConfiguration Include="ReleaseSEXE|x64">
|
|
||||||
<Configuration>ReleaseSEXE</Configuration>
|
|
||||||
<Platform>x64</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="PropertySheets">
|
|
||||||
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
|
|
||||||
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
|
|
||||||
<Import Project="$(ProjectDir)$(ProjectName).props" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="..\..\..\..\test\default\cmptest.h" />
|
|
||||||
<ClInclude Include="..\..\..\..\test\quirks\quirks.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
</Project>
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="..\..\..\..\test\default\cmptest.h">
|
|
||||||
<Filter>include</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\..\..\..\test\quirks\quirks.h">
|
|
||||||
<Filter>include</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Filter Include="src">
|
|
||||||
<UniqueIdentifier>{705beade-aa7f-49c0-900e-4b0cbbdc2f7b}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="include">
|
|
||||||
<UniqueIdentifier>{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}</UniqueIdentifier>
|
|
||||||
</Filter>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
Loading…
Reference in New Issue
Block a user