diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2013-12-16 21:17:50 +0100 |
|---|---|---|
| committer | Jan Dalheimer <jan@dalheimer.de> | 2013-12-16 21:17:50 +0100 |
| commit | 47bf7fff27665496bc4212bcaccc80350f665f97 (patch) | |
| tree | 878fd220464c5280fcbe589d3ed738ce0306ab2a /mmc_updater/src/tests/CMakeLists.txt | |
| parent | ae68adc3a536525990b0668703fd74eded8ccfde (diff) | |
| parent | dff00a6d2abb84a93e48ff00dda16444550d859f (diff) | |
| download | PrismLauncher-47bf7fff27665496bc4212bcaccc80350f665f97.tar.gz PrismLauncher-47bf7fff27665496bc4212bcaccc80350f665f97.tar.bz2 PrismLauncher-47bf7fff27665496bc4212bcaccc80350f665f97.zip | |
Merge remote-tracking branch 'upstream/develop' into updater_tests
Conflicts:
mmc_updater/src/tests/CMakeLists.txt
Diffstat (limited to 'mmc_updater/src/tests/CMakeLists.txt')
| -rw-r--r-- | mmc_updater/src/tests/CMakeLists.txt | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/mmc_updater/src/tests/CMakeLists.txt b/mmc_updater/src/tests/CMakeLists.txt index 85864791..1d62214e 100644 --- a/mmc_updater/src/tests/CMakeLists.txt +++ b/mmc_updater/src/tests/CMakeLists.txt @@ -5,21 +5,19 @@ if (APPLE) set(HELPER_SHARED_SOURCES ../StlSymbolsLeopard.cpp) endif() -# Create helper binaries for unit tests -add_executable(oldapp - old_app.cpp - ${HELPER_SHARED_SOURCES} -) -add_executable(newapp - new_app.cpp - ${HELPER_SHARED_SOURCES} -) +# # Create helper binaries for unit tests +# add_executable(oldapp +# old_app.cpp +# ${HELPER_SHARED_SOURCES} +# ) +# add_executable(newapp +# new_app.cpp +# ${HELPER_SHARED_SOURCES} +# ) # Install data files required by unit tests set(TEST_FILES file_list.xml - v2_file_list.xml - test-update.rb ) foreach(TEST_FILE ${TEST_FILES}) @@ -40,12 +38,6 @@ macro(ADD_UPDATER_TEST CLASS) endif() endmacro() -#add_updater_test(TestUpdateScript) +add_updater_test(TestParseScript) add_updater_test(TestUpdaterOptions) add_updater_test(TestFileUtils) - -# Add updater that that performs a complete update install -# and checks the result -#find_program(RUBY_BIN ruby) -#add_test(updater_TestUpdateInstall ${RUBY_BIN} test-update.rb) - |