Norse_Harold/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Replace usage of "GUIs" in cxxtest with the command line,

Browse Source 
and extend that to support -libdir <dir> and -disabled. Fixes #2488.

This was SVN commit r15795.
This commit is contained in:
leper 2014-09-24 15:35:31 +00:00
parent 29effb5089
commit 4753a0c1c2
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/premake/premake4.lua
View File

@ -1327,12 +1327,12 @@ function configure_cxxtestgen()
local lcxxtestrootoptions = "--have-std"
if _OPTIONS["jenkins-tests"] then
lcxxtestrootoptions = lcxxtestrootoptions .. " --gui=PsTestWrapper --runner=XmlPrinter"
lcxxtestrootoptions = lcxxtestrootoptions .. " --runner=XmlPrinter"
else
if os.is("windows") then
lcxxtestrootoptions = lcxxtestrootoptions .. " --gui=PsTestWrapper --runner=Win32ODSPrinter"
lcxxtestrootoptions = lcxxtestrootoptions .. " --runner=Win32ODSPrinter"
else
lcxxtestrootoptions = lcxxtestrootoptions .. " --gui=PsTestWrapper --runner=ErrorPrinter"
lcxxtestrootoptions = lcxxtestrootoptions .. " --runner=ErrorPrinter"
end
end

2
source/lib/sysdep/tests/test_sysdep.h
View File

@ -33,8 +33,6 @@
# include "mocks/unistd.h"
#endif
#include <cxxtest/PsTestWrapper.h>
class TestSysdep : public CxxTest::TestSuite
{
public: