diff options
author | Petr Mrázek <peterix@gmail.com> | 2014-01-05 16:47:12 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2014-01-05 16:47:12 +0100 |
commit | 0dcf694c8776ac03779e465bdc4859fba9be314d (patch) | |
tree | 25c742f97a98fb7534f8a2180f5b7b165bf7e8c5 /tests | |
parent | a64eebf8eb758971b090b2e87212c2458424797e (diff) | |
download | MultiMC-0dcf694c8776ac03779e465bdc4859fba9be314d.tar MultiMC-0dcf694c8776ac03779e465bdc4859fba9be314d.tar.gz MultiMC-0dcf694c8776ac03779e465bdc4859fba9be314d.tar.lz MultiMC-0dcf694c8776ac03779e465bdc4859fba9be314d.tar.xz MultiMC-0dcf694c8776ac03779e465bdc4859fba9be314d.zip |
More updater fixage
Preserve --dir parameter after updating
Allow more than one copy of a command line parameter in MultiMC
Linux runner script no longer changes current directory, which allows '--dir .'
Fixed unit tests, removed the obsolete one (for some legacy updater command line params that were also removed)
[fixes 63127704]
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 |