From 2e4fa7ec13fa8a255cebcd023ab17dbd65e8c2cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Thu, 3 Mar 2016 02:13:07 +0100 Subject: [PATCH] NOISSUE Fix bad unit test data path and usage of std::abs --- logic/minecraft/ParseUtils.cpp | 1 + tests/CMakeLists.txt | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/logic/minecraft/ParseUtils.cpp b/logic/minecraft/ParseUtils.cpp index 473ca1def..ca188432c 100644 --- a/logic/minecraft/ParseUtils.cpp +++ b/logic/minecraft/ParseUtils.cpp @@ -2,6 +2,7 @@ #include #include "ParseUtils.h" #include +#include QDateTime timeFromS3Time(QString str) { diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f95bf9052..0b5bfc907 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")