From 6961525faadf5d16fd1323af848ef88b7e1f26d4 Mon Sep 17 00:00:00 2001
From: Jan Dalheimer <jan@dalheimer.de>
Date: Sun, 5 Jan 2014 23:24:05 +0100
Subject: Unbreak and reactivate the some UpdateChecker tests

---
 tests/CMakeLists.txt | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'tests/CMakeLists.txt')

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2d851404..cc7d1a11 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -84,9 +84,18 @@ if(MultiMC_CODE_COVERAGE)
 	add_custom_target(MultiMC_RUN_TESTS DEPENDS MultiMC_GENERATE_COVERAGE_HTML)
 endif(MultiMC_CODE_COVERAGE)
 
+set(MultiMC_TEST_DATA_PATH "${CMAKE_CURRENT_BINARY_DIR}/data")
+if(UNIX)
+	# on unix we get the third / from the filename
+	set(MultiMC_TEST_DATA_PATH "file://${MultiMC_TEST_DATA_PATH}")
+else()
+	# we don't on windows, so we have to add it ourselves
+	set(MultiMC_TEST_DATA_PATH "file:///${MultiMC_TEST_DATA_PATH}")
+endif()
+file(GLOB data_files "data/*")
+foreach(data_file ${data_files})
+	get_filename_component(filename ${data_file} NAME)
+	configure_file(${data_file} ${CMAKE_CURRENT_BINARY_DIR}/data/${filename} @ONLY)
+endforeach()
 
-add_custom_target(MultiMC_Test_Data
- ALL
- COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_CURRENT_BINARY_DIR}/data
- COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data
-)
+configure_file(test_config.h.in test_config.h @ONLY)
-- 
cgit 


From e71295d7606a8fba95639051246b3c238148d0e2 Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Sat, 18 Jan 2014 22:51:04 +0100
Subject: Force using LF endlines while configuring tests

---
 tests/CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'tests/CMakeLists.txt')

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index cc7d1a11..7aeae59f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -95,7 +95,12 @@ endif()
 file(GLOB data_files "data/*")
 foreach(data_file ${data_files})
 	get_filename_component(filename ${data_file} NAME)
-	configure_file(${data_file} ${CMAKE_CURRENT_BINARY_DIR}/data/${filename} @ONLY)
+	configure_file(
+		${data_file}
+		${CMAKE_CURRENT_BINARY_DIR}/data/${filename}
+		@ONLY
+		NEWLINE_STYLE LF
+	)
 endforeach()
 
 configure_file(test_config.h.in test_config.h @ONLY)
-- 
cgit