From f3de1a930fb21f7202078d81a45839b52aac319a Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Wed, 15 Nov 2017 11:43:02 +0100 Subject: [PATCH] Change the file location to allow out-of-source builds --- test/CMakeLists.txt | 4 ++-- test/src/unit-files.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a3c341a..d4b1eed 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -16,6 +16,6 @@ target_include_directories(${UNITTEST_TARGET_NAME} PRIVATE "../src" "thirdparty/ ## Add tests to make ## add_test(NAME "${UNITTEST_TARGET_NAME}_default" - COMMAND ${UNITTEST_TARGET_NAME} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/build + COMMAND ${UNITTEST_TARGET_NAME} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/test/src/unit-files.cpp b/test/src/unit-files.cpp index 62616e2..0929f34 100644 --- a/test/src/unit-files.cpp +++ b/test/src/unit-files.cpp @@ -12,20 +12,20 @@ TEST_CASE("Files handling") { data["name"] = "Jeff"; SECTION("Files should be loaded") { - CHECK( env.load_file("../test/data/simple.txt") == "Hello {{ name }}." ); + CHECK( env.load_file("data/simple.txt") == "Hello {{ name }}." ); } SECTION("Files should be rendered") { - CHECK( env.render_template("../test/data/simple.txt", data) == "Hello Jeff." ); + CHECK( env.render_template("data/simple.txt", data) == "Hello Jeff." ); } SECTION("File includes should be rendered") { - CHECK( env.render_template("../test/data/include.txt", data) == "Answer: Hello Jeff." ); + CHECK( env.render_template("data/include.txt", data) == "Answer: Hello Jeff." ); } } TEST_CASE("Complete files") { - inja::Environment env = inja::Environment("../test/data/"); + inja::Environment env = inja::Environment("data/"); for (std::string test_name : {"simple-file", "nested", "nested-line"}) { SECTION(test_name) {