diff --git a/tests/actions/vstudio/sln2005/test_platforms.lua b/tests/actions/vstudio/sln2005/test_platforms.lua index 761c54b4..0e5579cc 100644 --- a/tests/actions/vstudio/sln2005/test_platforms.lua +++ b/tests/actions/vstudio/sln2005/test_platforms.lua @@ -623,23 +623,23 @@ --- function suite.sortsByBuildCfgAndPlatform() - platforms { "Windows", "PS3" } + platforms { "Windows", "Linux" } project "MyProject" prepare() test.capture [[ GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|PS3 = Debug|PS3 + Debug|Linux = Debug|Linux Debug|Windows = Debug|Windows - Release|PS3 = Release|PS3 + Release|Linux = Release|Linux Release|Windows = Release|Windows EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C9135098-6047-8142-B10E-D27E7F73FCB3}.Debug|PS3.ActiveCfg = Debug PS3|Win32 - {C9135098-6047-8142-B10E-D27E7F73FCB3}.Debug|PS3.Build.0 = Debug PS3|Win32 + {C9135098-6047-8142-B10E-D27E7F73FCB3}.Debug|Linux.ActiveCfg = Debug Linux|Win32 + {C9135098-6047-8142-B10E-D27E7F73FCB3}.Debug|Linux.Build.0 = Debug Linux|Win32 {C9135098-6047-8142-B10E-D27E7F73FCB3}.Debug|Windows.ActiveCfg = Debug Windows|Win32 {C9135098-6047-8142-B10E-D27E7F73FCB3}.Debug|Windows.Build.0 = Debug Windows|Win32 - {C9135098-6047-8142-B10E-D27E7F73FCB3}.Release|PS3.ActiveCfg = Release PS3|Win32 - {C9135098-6047-8142-B10E-D27E7F73FCB3}.Release|PS3.Build.0 = Release PS3|Win32 + {C9135098-6047-8142-B10E-D27E7F73FCB3}.Release|Linux.ActiveCfg = Release Linux|Win32 + {C9135098-6047-8142-B10E-D27E7F73FCB3}.Release|Linux.Build.0 = Release Linux|Win32 {C9135098-6047-8142-B10E-D27E7F73FCB3}.Release|Windows.ActiveCfg = Release Windows|Win32 {C9135098-6047-8142-B10E-D27E7F73FCB3}.Release|Windows.Build.0 = Release Windows|Win32 EndGlobalSection diff --git a/tests/actions/vstudio/vc200x/test_platforms.lua b/tests/actions/vstudio/vc200x/test_platforms.lua index f570ead1..d1de0bb0 100755 --- a/tests/actions/vstudio/vc200x/test_platforms.lua +++ b/tests/actions/vstudio/vc200x/test_platforms.lua @@ -80,23 +80,6 @@ end --- --- Verify the PS3 platform. --- - - function suite.platformIsCorrect_onPS3() - platforms { "PS3" } - prepare() - test.capture [[ - - - - ]] - end - - -- -- Verify the Xbox360 platform. -- diff --git a/tests/base/test_criteria.lua b/tests/base/test_criteria.lua index 29d61dd4..d3f0cca5 100644 --- a/tests/base/test_criteria.lua +++ b/tests/base/test_criteria.lua @@ -41,8 +41,8 @@ -- function suite.matches_fails_onIncompleteTermMatch() - crit = criteria.new { "platforms:ps3" } - test.isfalse(criteria.matches(crit, { platforms="ps3 ppu sn" })) + crit = criteria.new { "platforms:win64" } + test.isfalse(criteria.matches(crit, { platforms="win64 dll dcrt" })) end @@ -224,8 +224,8 @@ end function suite.fails_onIncompleteMatch_Unprefixed() - crit = criteria.new({ "ps3" }, true) - test.isfalse(criteria.matches(crit, { "ps3 ppu sn" })) + crit = criteria.new({ "win64" }, true) + test.isfalse(criteria.matches(crit, { "win64 dll dcrt" })) end function suite.passes_onPatternMatch_Unprefixed() diff --git a/tests/config/test_links.lua b/tests/config/test_links.lua index a9d51d74..509bb3d7 100755 --- a/tests/config/test_links.lua +++ b/tests/config/test_links.lua @@ -69,17 +69,17 @@ function suite.variableMaintained_onLeadingVariable() system "windows" location "build" - links { "$(SN_PS3_PATH)/sdk/lib/PS3TMAPI" } + links { "$(LOCAL_DEV_PATH)/sdk/lib/DEVMAPI" } local r = prepare("all", "fullpath") - test.isequal({ "$(SN_PS3_PATH)/sdk/lib/PS3TMAPI" }, r) + test.isequal({ "$(LOCAL_DEV_PATH)/sdk/lib/DEVMAPI" }, r) end function suite.variableMaintained_onQuotedVariable() system "windows" location "build" - links { '"$(SN_PS3_PATH)/sdk/lib/PS3TMAPI.lib"' } + links { '"$(LOCAL_DEV_PATH)/sdk/lib/DEVMAPI.lib"' } local r = prepare("all", "fullpath") - test.isequal({ '"$(SN_PS3_PATH)/sdk/lib/PS3TMAPI.lib"' }, r) + test.isequal({ '"$(LOCAL_DEV_PATH)/sdk/lib/DEVMAPI.lib"' }, r) end diff --git a/tests/project/test_config_maps.lua b/tests/project/test_config_maps.lua index 3ed69352..f40e764e 100644 --- a/tests/project/test_config_maps.lua +++ b/tests/project/test_config_maps.lua @@ -106,19 +106,19 @@ -- function suite.canMap_tupleToSingle() - platforms { "Win32", "PS3" } + platforms { "Win32", "Linux" } project ("MyProject") removeconfigurations "*" removeplatforms "*" - configurations { "Debug Win32", "Release Win32", "Debug PS3", "Release PS3" } + configurations { "Debug Win32", "Release Win32", "Debug Linux", "Release Linux" } configmap { [{"Debug", "Win32"}] = "Debug Win32", - [{"Debug", "PS3"}] = "Debug PS3", + [{"Debug", "Linux"}] = "Debug Linux", [{"Release", "Win32"}] = "Release Win32", - [{"Release", "PS3"}] = "Release PS3" + [{"Release", "Linux"}] = "Release Linux" } - prepare("Debug", "PS3") - test.isequal("Debug PS3", cfg.buildcfg) + prepare("Debug", "Linux") + test.isequal("Debug Linux", cfg.buildcfg) end @@ -128,7 +128,7 @@ -- function suite.canMap_tupleToTuple() - platforms { "Win32", "PS3" } + platforms { "Win32", "Linux" } project ("MyProject") removeconfigurations "*" removeplatforms "*" @@ -137,11 +137,11 @@ configmap { [{"Debug", "Win32"}] = { "Development", "x32" }, - [{"Debug", "PS3"}] = { "Development", "x64" }, + [{"Debug", "Linux"}] = { "Development", "x64" }, [{"Release", "Win32"}] = { "Production", "x32" }, - [{"Release", "PS3"}] = { "Production", "x64" }, + [{"Release", "Linux"}] = { "Production", "x64" }, } - prepare("Debug", "PS3") + prepare("Debug", "Linux") test.isequal({ "Development", "x64" }, { cfg.buildcfg, cfg.platform }) end