diff options
author | Petr Mrázek <peterix@gmail.com> | 2013-12-17 00:41:31 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2013-12-17 00:41:31 +0100 |
commit | 911dfa853089a8ab4d5619dbd1f053ac90edff0d (patch) | |
tree | 5c4e7c7f0daff25bbb2257d50188464e5695dbf3 /tests/TestUtil.h | |
parent | f8067a60346207d4b9b9f0c0eb5b1c3a70e28485 (diff) | |
parent | 47bf7fff27665496bc4212bcaccc80350f665f97 (diff) | |
download | PrismLauncher-911dfa853089a8ab4d5619dbd1f053ac90edff0d.tar.gz PrismLauncher-911dfa853089a8ab4d5619dbd1f053ac90edff0d.tar.bz2 PrismLauncher-911dfa853089a8ab4d5619dbd1f053ac90edff0d.zip |
Merge branch 'updater_tests' of https://github.com/02JanDal/MultiMC5 into develop
Diffstat (limited to 'tests/TestUtil.h')
-rw-r--r-- | tests/TestUtil.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/TestUtil.h b/tests/TestUtil.h index 865fcf87..5de8c4f2 100644 --- a/tests/TestUtil.h +++ b/tests/TestUtil.h @@ -24,11 +24,18 @@ struct TestsInternal #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[]) \ { \ - char *argv_[] = { argv[0] }; \ - int argc_ = 1; \ + char *argv_[] = { argv[0] _MMC_EXTRA_ARGV }; \ + int argc_ = 1 + _MMC_EXTRA_ARGC; \ MultiMC app(argc_, argv_, QDir::temp().absoluteFilePath("MultiMC_Test")); \ app.setAttribute(Qt::AA_Use96Dpi, true); \ TestObject tc; \ |