diff options
| author | Andrew <forkk@forkk.net> | 2013-12-15 15:01:34 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-12-15 15:01:34 -0600 |
| commit | 9d8006b597aead06f1d51dacbdb346ebab3d5e8f (patch) | |
| tree | 1f99ca1da321be32930198e3d72b2fc9d3bf53de /tests/data | |
| parent | 0ee8f90d40f5b3ddb177286c9066a4e59748c681 (diff) | |
| parent | b0e8037feb5b9d48defe6b8263d068f87bdb141c (diff) | |
| download | PrismLauncher-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.tar.gz PrismLauncher-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.tar.bz2 PrismLauncher-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news
Conflicts:
CMakeLists.txt
Diffstat (limited to 'tests/data')
| -rw-r--r-- | tests/data/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | tests/data/tst_userutils-test_createShortcut-unix | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/data/CMakeLists.txt b/tests/data/CMakeLists.txt new file mode 100644 index 00000000..eee5a596 --- /dev/null +++ b/tests/data/CMakeLists.txt @@ -0,0 +1,4 @@ +add_custom_target(MultiMC_Test_Data + ALL + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} +) diff --git a/tests/data/tst_userutils-test_createShortcut-unix b/tests/data/tst_userutils-test_createShortcut-unix new file mode 100755 index 00000000..1ce3a2bd --- /dev/null +++ b/tests/data/tst_userutils-test_createShortcut-unix @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +TryExec=asdfDest +Exec=asdfDest 'arg1' 'arg2' +Name=asdf +Icon= |