CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE Make tests no longer use the MultiMC object

Browse Source 
They do not require the application part anymore
This commit is contained in:
Petr Mrázek
2015-01-31 19:21:47 +01:00
parent 6f3aa65bd6
commit 9249768db5
12 changed files with 54 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/TestUtil.h
View File

@ -5,8 +5,6 @@
#include <QTest>
#include <QDir>
#include "MultiMC.h"
#include "test_config.h"
class TestsInternal
@ -27,23 +25,3 @@ public:
#define MULTIMC_GET_TEST_FILE(file) TestsInternal::readFile(QFINDTESTDATA(file))
#define MULTIMC_GET_TEST_FILE_UTF8(file) TestsInternal::readFileUtf8(QFINDTESTDATA(file))
#ifdef Q_OS_LINUX
#define _MMC_EXTRA_ARGV , "-platform", "offscreen"
#define _MMC_EXTRA_ARGC 2
#else
#define _MMC_EXTRA_ARGV
#define _MMC_EXTRA_ARGC 0
#endif
#define QTEST_GUILESS_MAIN_MULTIMC(TestObject) \
int main(int argc, char *argv[]) \
{ \
const char *argv_[] = { argv[0] _MMC_EXTRA_ARGV }; \
int argc_ = 1 + _MMC_EXTRA_ARGC; \
MultiMC app(argc_, const_cast<char**>(argv_), true); \
app.setAttribute(Qt::AA_Use96Dpi, true); \
TestObject tc; \
return QTest::qExec(&tc, argc, argv); \
}