diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-01-05 16:54:03 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-01-05 16:54:03 +0100 |
| commit | 6bf5c362ba0fa641440fabb78dbbaf4f7656a253 (patch) | |
| tree | 820934546683b334568af418286985bab6e65e4f /tests | |
| parent | ced640f68c25c1ea40f86be5af736aa0263dd3ee (diff) | |
| parent | 0dcf694c8776ac03779e465bdc4859fba9be314d (diff) | |
| download | PrismLauncher-6bf5c362ba0fa641440fabb78dbbaf4f7656a253.tar.gz PrismLauncher-6bf5c362ba0fa641440fabb78dbbaf4f7656a253.tar.bz2 PrismLauncher-6bf5c362ba0fa641440fabb78dbbaf4f7656a253.zip | |
Merge branch 'updater-tweak' into develop
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/TestUtil.h | 2 | ||||
| -rw-r--r-- | tests/tst_DownloadUpdateTask.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/TestUtil.h b/tests/TestUtil.h index 231ce7f6..57d1fdf2 100644 --- a/tests/TestUtil.h +++ b/tests/TestUtil.h @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) \ { \ char *argv_[] = { argv[0] _MMC_EXTRA_ARGV }; \ int argc_ = 1 + _MMC_EXTRA_ARGC; \ - MultiMC app(argc_, argv_/*, QDir::temp().absoluteFilePath("MultiMC_Test")*/); \ + MultiMC app(argc_, argv_, true); \ app.setAttribute(Qt::AA_Use96Dpi, true); \ TestObject tc; \ return QTest::qExec(&tc, argc, argv); \ diff --git a/tests/tst_DownloadUpdateTask.cpp b/tests/tst_DownloadUpdateTask.cpp index 3b2c6793..883e90e8 100644 --- a/tests/tst_DownloadUpdateTask.cpp +++ b/tests/tst_DownloadUpdateTask.cpp @@ -254,7 +254,7 @@ slots: pathOrig = path = "MultiMC.app/Foo/Bar/Baz"; qDebug() << "Proper OSX path: " << path; result = DownloadUpdateTask::fixPathForOSX(path); - QCOMPARE(path, QString("../../Foo/Bar/Baz")); + QCOMPARE(path, QString("Foo/Bar/Baz")); QCOMPARE(result, true); // Bad OSX path |