diff options
| author | marcel <marcel@FreeBSD.org> | 2013-05-29 19:41:36 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2013-05-29 19:41:36 +0000 |
| commit | fbbd9fba54c1702c0bd1eb59914184cd73f191fa (patch) | |
| tree | a76537d5285dbee6695f7761f451f0f96d2d16d0 /contrib/atf/atf-c++/detail/test_helpers.cpp | |
| parent | d095ed802f385ba9dd5e1d6308ac489c95ae3841 (diff) | |
| download | FreeBSD-src-fbbd9fba54c1702c0bd1eb59914184cd73f191fa.zip FreeBSD-src-fbbd9fba54c1702c0bd1eb59914184cd73f191fa.tar.gz | |
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 <yaneurabeya@gmail.com>
Diffstat (limited to 'contrib/atf/atf-c++/detail/test_helpers.cpp')
| -rw-r--r-- | contrib/atf/atf-c++/detail/test_helpers.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
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 |
