diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-12-25 03:25:21 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-12-25 03:25:21 +0100 |
| commit | 0d7b411729b89c5cebc8baaf48bec46fb182536b (patch) | |
| tree | 98a49b61668f5ef028b81c6b445e0dce13770aca | |
| parent | 8edd0100e852cda9f44abd12cc06931542a2004a (diff) | |
| download | MultiMC-0d7b411729b89c5cebc8baaf48bec46fb182536b.tar MultiMC-0d7b411729b89c5cebc8baaf48bec46fb182536b.tar.gz MultiMC-0d7b411729b89c5cebc8baaf48bec46fb182536b.tar.lz MultiMC-0d7b411729b89c5cebc8baaf48bec46fb182536b.tar.xz MultiMC-0d7b411729b89c5cebc8baaf48bec46fb182536b.zip | |
No more windows paths in tests.
| -rw-r--r-- | tests/data/tst_DownloadUpdateTask-test_writeInstallScript_win32.xml | 17 | ||||
| -rw-r--r-- | tests/tst_DownloadUpdateTask.cpp | 4 |
2 files changed, 0 insertions, 21 deletions
diff --git a/tests/data/tst_DownloadUpdateTask-test_writeInstallScript_win32.xml b/tests/data/tst_DownloadUpdateTask-test_writeInstallScript_win32.xml deleted file mode 100644 index c79ef984..00000000 --- a/tests/data/tst_DownloadUpdateTask-test_writeInstallScript_win32.xml +++ /dev/null @@ -1,17 +0,0 @@ -<update version="3"> - <install> - <file> - <source>sourceOne</source> - <dest>destOne</dest> - <mode>0777</mode> - </file> - <file> - <source>MultiMC.exe</source> - <dest>M\u\l\t\i\M\C\e\x\e</dest> - <mode>0644</mode> - </file> - </install> - <uninstall> - <file>toDelete.abc</file> - </uninstall> -</update> diff --git a/tests/tst_DownloadUpdateTask.cpp b/tests/tst_DownloadUpdateTask.cpp index 764af935..f47552fe 100644 --- a/tests/tst_DownloadUpdateTask.cpp +++ b/tests/tst_DownloadUpdateTask.cpp @@ -99,11 +99,7 @@ slots: ops << DownloadUpdateTask::UpdateOperation::CopyOp("sourceOne", "destOne", 0777) << DownloadUpdateTask::UpdateOperation::CopyOp("MultiMC.exe", "M/u/l/t/i/M/C/e/x/e") << DownloadUpdateTask::UpdateOperation::DeleteOp("toDelete.abc"); -#if defined(Q_OS_WIN) - auto testFile = "tests/data/tst_DownloadUpdateTask-test_writeInstallScript_win32.xml"; -#else auto testFile = "tests/data/tst_DownloadUpdateTask-test_writeInstallScript.xml"; -#endif const QString script = QDir::temp().absoluteFilePath("MultiMCUpdateScript.xml"); QVERIFY(task.writeInstallScript(ops, script)); QCOMPARE(TestsInternal::readFileUtf8(script).replace(QRegExp("[\r\n]+"), "\n"), |