Fix failing PS3 related unit tests

This commit is contained in:
Jason Perkins 2014-12-18 16:41:58 -05:00
parent 934e3cecf8
commit a8f4c5561a
5 changed files with 7 additions and 56 deletions

View File

@ -1,50 +0,0 @@
--
-- tests/actions/make/cpp/test_ps3.lua
-- Tests for PS3 support in makefiles.
-- Copyright (c) 2012-2013 Jason Perkins and the Premake project
--
local suite = test.declare("make_ps3")
local make = premake.make
local cpp = premake.make.cpp
local project = premake.project
--
-- Setup
--
local sln, prj, cfg
function suite.setup()
sln, prj = test.createsolution()
system "ps3"
cfg = test.getconfig(prj, "Debug")
end
--
-- Make sure that the correct compilers are used.
--
function suite.usesCorrectCompilers()
make.cppTools(cfg, premake.tools.gcc)
test.capture [[
CC = ppu-lv2-g++
CXX = ppu-lv2-g++
AR = ppu-lv2-ar
]]
end
--
-- Make sure the target is correctly named.
--
function suite.usesCorrectTarget()
make.target(cfg)
test.capture [[
TARGETDIR = .
TARGET = $(TARGETDIR)/MyProject.elf
]]
end

View File

@ -15,12 +15,13 @@
local sln, prj
function suite.setup()
_ACTION = "vs2008"
premake.escaper(premake.vstudio.vs2005.esc)
sln = test.createsolution()
end
local function prepare()
prj = premake.solution.getproject(sln, 1)
prj = test.getproject(sln, 1)
vc200x.files(prj)
end

View File

@ -95,7 +95,7 @@
--
function suite.noKeyword_onNotWindows()
system "PS3"
system "Linux"
prepare()
test.capture [[
<VisualStudioProject
@ -117,7 +117,7 @@
filter "Debug"
system "Windows"
filter "Release"
system "PS3"
system "Linux"
prepare()
test.capture [[
<VisualStudioProject

View File

@ -231,7 +231,7 @@
function suite.excludedFromBuild_onResourceFile_excludeFlag_nonWindows()
files { "hello.rc" }
system "PS3"
system "Linux"
filter "files:hello.rc"
flags { "ExcludeFromBuild" }
prepare()

View File

@ -83,7 +83,7 @@
--
function suite.noKeyword_onNotWindows()
system "PS3"
system "Linux"
prepare()
test.capture [[
<PropertyGroup Label="Globals">
@ -101,7 +101,7 @@
filter "Debug"
system "Windows"
filter "Release"
system "PS3"
system "Linux"
prepare()
test.capture [[
<PropertyGroup Label="Globals">