From 0fbd18b0dd8827bc3c817385a3ac995166810836 Mon Sep 17 00:00:00 2001
From: Michael Krasnyk <michael.krasnyk@gmail.com>
Date: Sun, 4 Dec 2016 12:55:11 +0100
Subject: [PATCH] Make absolute fixtures path

---
 test/data/Makefile                     |  2 +-
 unit_tests/CMakeLists.txt              |  2 ++
 unit_tests/extractor/raster_source.cpp | 10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/test/data/Makefile b/test/data/Makefile
index d593521e8..38d5a21bc 100755
--- a/test/data/Makefile
+++ b/test/data/Makefile
@@ -15,7 +15,7 @@ PROFILE:=$(PROFILE_ROOT)/car.lua
 all: $(DATA_NAME).osrm.hsgr
 
 clean:
-	rm $(DATA_NAME).*
+	-rm $(DATA_NAME).*
 
 $(DATA_NAME).osm.pbf:
 	wget $(DATA_URL) -O $(DATA_NAME).osm.pbf
diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
index bfb51d607..3b3144a6e 100644
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -48,6 +48,8 @@ if(NOT WIN32 AND NOT Boost_USE_STATIC_LIBS)
   add_definitions(-DBOOST_TEST_DYN_LINK)
 endif()
 
+target_compile_definitions(extractor-tests PRIVATE COMPILE_DEFINITIONS OSRM_FIXTURES_DIR="${CMAKE_SOURCE_DIR}/unit_tests/fixtures")
+
 target_include_directories(engine-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_include_directories(library-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_include_directories(util-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/unit_tests/extractor/raster_source.cpp b/unit_tests/extractor/raster_source.cpp
index 0ad651592..7693c6370 100644
--- a/unit_tests/extractor/raster_source.cpp
+++ b/unit_tests/extractor/raster_source.cpp
@@ -23,8 +23,8 @@ int normalize(double coord) { return static_cast<int>(coord * COORDINATE_PRECISI
 BOOST_AUTO_TEST_CASE(raster_test)
 {
     SourceContainer sources;
-    int source_id = sources.LoadRasterSource(
-        "../unit_tests/fixtures/raster_data.asc", 1, 1.09, 1, 1.09, 10, 10);
+    int source_id =
+        sources.LoadRasterSource(OSRM_FIXTURES_DIR "/raster_data.asc", 1, 1.09, 1, 1.09, 10, 10);
     BOOST_CHECK_EQUAL(source_id, 0);
 
     // Expected nearest-neighbor queries
@@ -67,15 +67,15 @@ BOOST_AUTO_TEST_CASE(raster_test)
     CHECK_INTERPOLATE(0, 1.056, 1.028, 68);
     CHECK_INTERPOLATE(0, 1.05, 1.028, 56);
 
-    int source_already_loaded_id = sources.LoadRasterSource(
-        "../unit_tests/fixtures/raster_data.asc", 1, 1.09, 1, 1.09, 10, 10);
+    int source_already_loaded_id =
+        sources.LoadRasterSource(OSRM_FIXTURES_DIR "/raster_data.asc", 1, 1.09, 1, 1.09, 10, 10);
 
     BOOST_CHECK_EQUAL(source_already_loaded_id, 0);
     BOOST_CHECK_THROW(sources.GetRasterDataFromSource(1, normalize(1.02), normalize(1.02)),
                       util::exception);
 
     BOOST_CHECK_THROW(
-        sources.LoadRasterSource("../unit_tests/fixtures/nonexistent.asc", 0, 1.1, 0, 1.1, 7, 7),
+        sources.LoadRasterSource(OSRM_FIXTURES_DIR "/nonexistent.asc", 0, 1.1, 0, 1.1, 7, 7),
         util::exception);
 }