fix unit-tests.

This commit is contained in:
Tom van Dijck 2015-07-02 07:14:26 -07:00
parent c3d9ca6c89
commit 31e3588d54
14 changed files with 46 additions and 66 deletions

View File

@ -99,8 +99,8 @@
prepare { "ldFlags", "libs", "ldDeps" }
test.capture [[
ALL_LDFLAGS += $(LDFLAGS) -s
LIBS += build/libMyProject2.a
LDDEPS += build/libMyProject2.a
LIBS += build/bin/Debug/libMyProject2.a
LDDEPS += build/bin/Debug/libMyProject2.a
]]
end
@ -119,8 +119,8 @@
prepare { "ldFlags", "libs", "ldDeps" }
test.capture [[
ALL_LDFLAGS += $(LDFLAGS) -s
LIBS += build/libMyProject2.so
LDDEPS += build/libMyProject2.so
LIBS += build/bin/Debug/libMyProject2.so
LDDEPS += build/bin/Debug/libMyProject2.so
]]
end
@ -138,9 +138,9 @@
prepare { "ldFlags", "libs", "ldDeps" }
test.capture [[
ALL_LDFLAGS += $(LDFLAGS) -Lbuild -s
ALL_LDFLAGS += $(LDFLAGS) -Lbuild/bin/Debug -s
LIBS += -lMyProject2
LDDEPS += build/libMyProject2.so
LDDEPS += build/bin/Debug/libMyProject2.so
]]
end

View File

@ -54,6 +54,6 @@
prepare ()
test.capture [[
DEPENDS = MyProject2.dll MyProject3.dll
DEPENDS = bin/Debug/MyProject2.dll bin/Debug/MyProject3.dll
]]
end

View File

@ -48,7 +48,7 @@
_ACTION = "vs2008"
prepare()
test.capture [[
<OutputPath>.\</OutputPath>
<OutputPath>bin\Debug\</OutputPath>
<IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
]]
end
@ -57,7 +57,7 @@
_ACTION = "vs2010"
prepare()
test.capture [[
<OutputPath>.\</OutputPath>
<OutputPath>bin\Debug\</OutputPath>
<BaseIntermediateOutputPath>obj\Debug\</BaseIntermediateOutputPath>
<IntermediateOutputPath>$(BaseIntermediateOutputPath)</IntermediateOutputPath>
]]

View File

@ -37,7 +37,7 @@
test.capture [[
<Configuration
Name="Debug|Win32"
OutputDirectory="."
OutputDirectory="bin\Debug"
IntermediateDirectory="obj\Debug"
ConfigurationType="1"
CharacterSet="2"
@ -101,7 +101,7 @@
test.capture [[
<Configuration
Name="Debug|Win32"
OutputDirectory="."
OutputDirectory="bin\Debug"
IntermediateDirectory="obj\Debug"
ConfigurationType="0"
>
@ -114,7 +114,7 @@
test.capture [[
<Configuration
Name="Debug|Win32"
OutputDirectory="."
OutputDirectory="bin\Debug"
IntermediateDirectory="obj\Debug"
ConfigurationType="0"
>

View File

@ -68,6 +68,6 @@
<Tool
Name="VCLinkerTool"
LinkLibraryDependencies="false"
AdditionalDependencies="MyProject2.lib"
AdditionalDependencies="bin\Ares\Debug\MyProject2.lib"
]]
end

View File

@ -82,7 +82,7 @@
LinkIncremental="2"
GenerateDebugInformation="false"
SubSystem="2"
ImportLibrary="MyProject.lib"
ImportLibrary="bin\Debug\MyProject.lib"
TargetMachine="1"
/>
]]
@ -245,7 +245,7 @@
<Tool
Name="VCLinkerTool"
LinkLibraryDependencies="false"
AdditionalDependencies="MyProject2.lib"
AdditionalDependencies="bin\Debug\MyProject2.lib"
]]
end

View File

@ -254,7 +254,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<OutDir>.\</OutDir>
<OutDir>bin\Debug\</OutDir>
<IntDir>obj\Debug\</IntDir>
</PropertyGroup>
]]
@ -267,7 +267,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<OutDir>.\</OutDir>
<OutDir>bin\Debug\</OutDir>
<IntDir>obj\Debug\</IntDir>
</PropertyGroup>
]]

View File

@ -71,7 +71,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<AdditionalDependencies>MyProject2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>bin/Ares/Debug/MyProject2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
</Link>
<ProjectReference>

View File

@ -38,7 +38,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<ImportLibrary>MyProject.lib</ImportLibrary>
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
</Link>
]]
end
@ -57,7 +57,7 @@
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<ImportLibrary>MyProject.lib</ImportLibrary>
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
</Link>
]]
end
@ -96,7 +96,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<ImportLibrary>MyProject.lib</ImportLibrary>
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
</Link>
]]
end
@ -124,7 +124,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<ImportLibrary>MyProject.lib</ImportLibrary>
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
</Link>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@ -194,7 +194,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<ImportLibrary>MyProject.lib</ImportLibrary>
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
</Link>
]]
end
@ -214,8 +214,8 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<AdditionalDependencies>MyProject2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ImportLibrary>MyProject.lib</ImportLibrary>
<AdditionalDependencies>bin/Debug/MyProject2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
</Link>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@ -273,7 +273,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<ImportLibrary>MyProject.lib</ImportLibrary>
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
<AdditionalOptions>/kupo %(AdditionalOptions)</AdditionalOptions>
]]
end
@ -322,7 +322,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<ImportLibrary>MyProject.lib</ImportLibrary>
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
<ModuleDefinitionFile>hello.def</ModuleDefinitionFile>
</Link>
]]
@ -421,7 +421,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<ImportLibrary>MyProject.lib</ImportLibrary>
<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
<GenerateMapFile>true</GenerateMapFile>
</Link>
]]

View File

@ -34,7 +34,7 @@
test.capture [[
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>.\</OutDir>
<OutDir>bin\Debug\</OutDir>
<IntDir>obj\Debug\</IntDir>
<TargetName>MyProject</TargetName>
<TargetExt>.exe</TargetExt>
@ -70,7 +70,7 @@
test.capture [[
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
<LinkIncremental>true</LinkIncremental>
<OutDir>.\</OutDir>
<OutDir>bin\Debug\</OutDir>
<OutputFile>$(OutDir)MyProject.exe</OutputFile>
<IntDir>obj\Debug\</IntDir>
<TargetName>MyProject</TargetName>
@ -86,7 +86,7 @@
prepare()
test.capture [[
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
<OutDir>.\</OutDir>
<OutDir>bin\Debug\</OutDir>
<OutputFile>$(OutDir)MyProject.lib</OutputFile>
<IntDir>obj\Debug\</IntDir>
<TargetName>MyProject</TargetName>
@ -106,7 +106,7 @@
prepare()
test.capture [[
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\</OutDir>
<OutDir>bin\Debug\</OutDir>
]]
end
@ -147,7 +147,7 @@
test.capture [[
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>.\</OutDir>
<OutDir>bin\Debug\</OutDir>
<IntDir>..\tmp\Debug\</IntDir>
]]
end
@ -162,7 +162,7 @@
test.capture [[
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>.\</OutDir>
<OutDir>bin\Debug\</OutDir>
<IntDir>obj\Debug\</IntDir>
<TargetName>MyTarget</TargetName>
]]
@ -190,7 +190,7 @@
test.capture [[
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>.\</OutDir>
<OutDir>bin\Debug\</OutDir>
]]
end
@ -205,7 +205,7 @@
test.capture [[
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>.\</OutDir>
<OutDir>bin\Debug\</OutDir>
<IntDir>obj\Debug\</IntDir>
<TargetName>MyProject</TargetName>
<TargetExt>.exe</TargetExt>
@ -224,7 +224,7 @@
test.capture [[
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>.\</OutDir>
<OutDir>bin\Debug\</OutDir>
<IntDir>obj\Debug\</IntDir>
<TargetName>MyProject</TargetName>
<TargetExt>
@ -245,7 +245,7 @@
test.capture [[
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>.\</OutDir>
<OutDir>bin\Debug\</OutDir>
<IntDir>obj\Debug\</IntDir>
<TargetName>MyProject</TargetName>
<TargetExt>.exe</TargetExt>
@ -265,7 +265,7 @@
test.capture [[
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>.\</OutDir>
<OutDir>bin\Debug\</OutDir>
<IntDir>obj\Debug\</IntDir>
<TargetName>MyProject</TargetName>
<TargetExt>.exe</TargetExt>
@ -280,7 +280,7 @@
test.capture [[
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>.\</OutDir>
<OutDir>bin\Debug\</OutDir>
<IntDir>obj\Debug\</IntDir>
<TargetName>MyProject</TargetName>
<TargetExt>.exe</TargetExt>

View File

@ -27,16 +27,6 @@
end
--
-- Directory should be current (".") by default.
--
function suite.directoryIsDot_onNoTargetDir()
i = prepare()
test.isequal(".", path.getrelative(os.getcwd(), i.directory))
end
--
-- Directory should use targetdir() value if present.
--

View File

@ -135,7 +135,7 @@
language "C++"
local r = prepare("all", "fullpath")
test.isequal({ "MyProject2.lib" }, r)
test.isequal({ "bin/Debug/MyProject2.lib" }, r)
end
function suite.canLink_CsAndCs()
@ -147,7 +147,7 @@
language "C#"
local r = prepare("all", "fullpath")
test.isequal({ "MyProject2.dll" }, r)
test.isequal({ "bin/Debug/MyProject2.dll" }, r)
end
function suite.canLink_ManagedCppAndManagedCpp()
@ -160,7 +160,7 @@
clr "On"
local r = prepare("all", "fullpath")
test.isequal({ "MyProject2.lib" }, r)
test.isequal({ "bin/Debug/MyProject2.lib" }, r)
end
function suite.canLink_ManagedCppAndCs()
@ -172,7 +172,7 @@
language "C#"
local r = prepare("all", "fullpath")
test.isequal({ "MyProject2.dll" }, r)
test.isequal({ "bin/Debug/MyProject2.dll" }, r)
end

View File

@ -26,16 +26,6 @@
end
--
-- Directory should be current (".") by default.
--
function suite.directoryIsDot_onNoTargetDir()
i = prepare()
test.isequal(".", path.getrelative(os.getcwd(), i.directory))
end
--
-- Directory uses targetdir() value if present.
--
@ -242,7 +232,7 @@
kind "WindowedApp"
system "MacOSX"
i = prepare()
test.isequal("MyProject.app/Contents/MacOS", path.getrelative(os.getcwd(), i.bundlepath))
test.isequal("bin/Debug/MyProject.app/Contents/MacOS", path.getrelative(os.getcwd(), i.bundlepath))
end

View File

@ -259,7 +259,7 @@
system "Windows"
kind "SharedLib"
prepare()
test.contains({ "-shared", '-Wl,--out-implib="MyProject.lib"' }, gcc.getldflags(cfg))
test.contains({ "-shared", '-Wl,--out-implib="bin/Debug/MyProject.lib"' }, gcc.getldflags(cfg))
end
function suite.ldflags_onWindowsApp()