From 948694fd27ff14ce7fce3f3e8746b8a44383d2bb Mon Sep 17 00:00:00 2001
From: Marko Budiselic <mbudiselicbuda@gmail.com>
Date: Sun, 18 Dec 2016 10:16:07 +0100
Subject: [PATCH] tests data bug fix - too many copies of tests/data

---
 CMakeLists.txt                  | 13 -------------
 tests/CMakeLists.txt            | 16 +++++++++++++---
 tests/unit/cypher_traversal.cpp |  2 +-
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fdf552c3..9f6c9eb5c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,19 +40,6 @@ set(cxx_standard 14)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
 # -----------------------------------------------------------------------------
 
-# custom targets
-# move test data data to the build directory
-if (UNIX)
-    set(test_data "tests/data")
-    set(test_data_src "${CMAKE_SOURCE_DIR}/${test_data}")
-	set(test_data_dst "${CMAKE_BINARY_DIR}/${test_data}")
-	add_custom_target (test_data
-		COMMAND rm -rf ${test_data_dst}
-        COMMAND cp -r ${test_data_src} ${test_data_dst}
-	)
-endif (UNIX)
-# -----------------------------------------------------------------------------
-
 # dir variables
 set(src_dir ${CMAKE_SOURCE_DIR}/src)
 set(libs_dir ${CMAKE_SOURCE_DIR}/libs)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8e243cf8d..a83e7954d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,11 +6,21 @@ enable_testing()
 
 include_directories(${catch_source_dir}/include)
 
-# copy unit test data
+# copy test data
 file(COPY ${CMAKE_SOURCE_DIR}/tests/data
      DESTINATION ${CMAKE_BINARY_DIR}/tests)
-file(COPY ${CMAKE_SOURCE_DIR}/tests/data
-     DESTINATION ${CMAKE_BINARY_DIR}/tests/unit)
+
+# move test data data to the build directory
+if (UNIX)
+    set(test_data "tests/data")
+    set(test_data_src "${CMAKE_SOURCE_DIR}/${test_data}")
+	set(test_data_dst "${CMAKE_BINARY_DIR}/${test_data}")
+	add_custom_target (test_data
+		COMMAND rm -rf ${test_data_dst}
+        COMMAND cp -r ${test_data_src} ${test_data_dst}
+	)
+endif (UNIX)
+# -----------------------------------------------------------------------------
 
 # benchmark test binaries
 if (ALL_TESTS OR BENCHMARK_TESTS)
diff --git a/tests/unit/cypher_traversal.cpp b/tests/unit/cypher_traversal.cpp
index 16123d92b..85c1ba529 100644
--- a/tests/unit/cypher_traversal.cpp
+++ b/tests/unit/cypher_traversal.cpp
@@ -19,7 +19,7 @@ auto load_queries()
 {
     std::vector<std::string> queries;
 
-    fs::path queries_path = "data/queries/cypher";
+    fs::path queries_path = "../data/queries/cypher";
     std::string query_file_extension = "cypher";
 
     for (auto& directory_entry :