From 4753a0c1c2acd0039b13c2871928f1d881062727 Mon Sep 17 00:00:00 2001 From: leper Date: Wed, 24 Sep 2014 15:35:31 +0000 Subject: [PATCH] Replace usage of "GUIs" in cxxtest with the command line, and extend that to support -libdir and -disabled. Fixes #2488. This was SVN commit r15795. --- build/premake/premake4.lua | 6 +++--- source/lib/sysdep/tests/test_sysdep.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build/premake/premake4.lua b/build/premake/premake4.lua index c99ce6dc12..28cd80df8d 100644 --- a/build/premake/premake4.lua +++ b/build/premake/premake4.lua @@ -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 diff --git a/source/lib/sysdep/tests/test_sysdep.h b/source/lib/sysdep/tests/test_sysdep.h index faad5d0618..0ebf6bb814 100644 --- a/source/lib/sysdep/tests/test_sysdep.h +++ b/source/lib/sysdep/tests/test_sysdep.h @@ -33,8 +33,6 @@ # include "mocks/unistd.h" #endif -#include - class TestSysdep : public CxxTest::TestSuite { public: