From fbbd9fba54c1702c0bd1eb59914184cd73f191fa Mon Sep 17 00:00:00 2001 From: marcel Date: Wed, 29 May 2013 19:41:36 +0000 Subject: Modify atf::fs::path::get_process_helpers_path API to properly handle pathing with detail/ tests. Based on patch pushed upstream to ATF project. Obtained from: Garrett Cooper --- contrib/atf/atf-c++/detail/test_helpers.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'contrib/atf/atf-c++/detail/test_helpers.cpp') diff --git a/contrib/atf/atf-c++/detail/test_helpers.cpp b/contrib/atf/atf-c++/detail/test_helpers.cpp index 42bd711..107b45a 100644 --- a/contrib/atf/atf-c++/detail/test_helpers.cpp +++ b/contrib/atf/atf-c++/detail/test_helpers.cpp @@ -82,10 +82,14 @@ header_check(const char *hdrname) } atf::fs::path -get_process_helpers_path(const atf::tests::tc& tc) +get_process_helpers_path(const atf::tests::tc& tc, bool is_detail) { - return atf::fs::path(tc.get_config_var("srcdir")) / - ".." / "atf-c" / "detail" / "process_helpers"; + if (is_detail) + return atf::fs::path(tc.get_config_var("srcdir")) / + ".." / ".." / "atf-c" / "detail" / "process_helpers"; + else + return atf::fs::path(tc.get_config_var("srcdir")) / + ".." / "atf-c" / "detail" / "process_helpers"; } bool -- cgit v1.1