diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-03-03 02:13:07 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-03-03 02:13:07 +0100 |
| commit | 2e4fa7ec13fa8a255cebcd023ab17dbd65e8c2cb (patch) | |
| tree | bb333316de339b10b6624e3d7a4c670339b02a19 | |
| parent | fd2103d6ee011cebabaa6832743183e1fa89ae0f (diff) | |
| download | MultiMC-2e4fa7ec13fa8a255cebcd023ab17dbd65e8c2cb.tar MultiMC-2e4fa7ec13fa8a255cebcd023ab17dbd65e8c2cb.tar.gz MultiMC-2e4fa7ec13fa8a255cebcd023ab17dbd65e8c2cb.tar.lz MultiMC-2e4fa7ec13fa8a255cebcd023ab17dbd65e8c2cb.tar.xz MultiMC-2e4fa7ec13fa8a255cebcd023ab17dbd65e8c2cb.zip | |
NOISSUE Fix bad unit test data path and usage of std::abs
| -rw-r--r-- | logic/minecraft/ParseUtils.cpp | 1 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/logic/minecraft/ParseUtils.cpp b/logic/minecraft/ParseUtils.cpp index 473ca1de..ca188432 100644 --- a/logic/minecraft/ParseUtils.cpp +++ b/logic/minecraft/ParseUtils.cpp @@ -2,6 +2,7 @@ #include <QString> #include "ParseUtils.h" #include <QDebug> +#include <cstdlib> QDateTime timeFromS3Time(QString str) { diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f95bf905..0b5bfc90 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -98,16 +98,14 @@ endif(MultiMC_CODE_COVERAGE) set(MultiMC_TEST_DATA_PATH "${CMAKE_CURRENT_BINARY_DIR}/data") set(MultiMC_TEST_DATA_PATH_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/data") -set(MultiMC_TEST_DATA_PATH_RAW "${CMAKE_CURRENT_BINARY_DIR}/data_raw") set(MultiMC_TEST_DATA_PATH_SOURCE_RAW "${CMAKE_CURRENT_SOURCE_DIR}/data_raw") # clean and replace test data add_custom_command( TARGET test_data COMMAND ${CMAKE_COMMAND} -E remove_directory ${MultiMC_TEST_DATA_PATH} - COMMAND ${CMAKE_COMMAND} -E remove_directory ${MultiMC_TEST_DATA_PATH} COMMAND ${CMAKE_COMMAND} -E copy_directory ${MultiMC_TEST_DATA_PATH_SOURCE} ${MultiMC_TEST_DATA_PATH} - COMMAND ${CMAKE_COMMAND} -E copy_directory ${MultiMC_TEST_DATA_PATH_SOURCE_RAW} ${MultiMC_TEST_DATA_PATH_RAW} + COMMAND ${CMAKE_COMMAND} -E copy_directory ${MultiMC_TEST_DATA_PATH_SOURCE_RAW} ${MultiMC_TEST_DATA_PATH} ) message("${CMAKE_CURRENT_BINARY_DIR}/data") |