From b2b6e97c465e6ea7f9e9e631898d5ec26c65daa1 Mon Sep 17 00:00:00 2001 From: Julio Merino Date: Fri, 15 Nov 2013 21:28:06 +0000 Subject: Import atf-0.17: Experimental version released on February 14th, 2013. * Added the atf_utils_cat_file, atf_utils_compare_file, atf_utils_copy_file, atf_utils_create_file, atf_utils_file_exists, atf_utils_fork, atf_utils_grep_file, atf_utils_grep_string, atf_utils_readline, atf_utils_redirect and atf_utils_wait utility functions to atf-c-api. Documented the already-public atf_utils_free_charpp function. * Added the cat_file, compare_file, copy_file, create_file, file_exists, fork, grep_collection, grep_file, grep_string, redirect and wait functions to the atf::utils namespace of atf-c++-api. These are wrappers around the same functions added to the atf-c-api library. * Added the ATF_CHECK_MATCH, ATF_CHECK_MATCH_MSG, ATF_REQUIRE_MATCH and ATF_REQUIRE_MATCH_MSG macros to atf-c to simplify the validation of a string against a regular expression. * Miscellaneous fixes for manpage typos and compilation problems with clang. * Added caching of the results of those configure tests that rely on executing a test program. This should help crossbuild systems by providing a mechanism to pre-specify what the results should be. * X-NetBSD-PR bin/45690: Make atf-report convert any non-printable characters to a plain-text representation (matching their corresponding hexadecimal entities) in XML output files. This is to prevent the output of test cases from breaking xsltproc later. Note that this import, compared to the one for 0.16, brings in all the files that are part of the release. This is to follow the Subversion Primer guidelines, which mention that all files should be imported first and only dropped when merging into contrib/atf/. Approved by: rpaulo (mentor) --- test-programs/cpp_helpers.cpp | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'test-programs/cpp_helpers.cpp') diff --git a/test-programs/cpp_helpers.cpp b/test-programs/cpp_helpers.cpp index 4487aefb6643..d8a495e7c67e 100644 --- a/test-programs/cpp_helpers.cpp +++ b/test-programs/cpp_helpers.cpp @@ -36,7 +36,7 @@ extern "C" { #include #include -#include "atf-c++/macros.hpp" +#include #include "atf-c++/detail/fs.hpp" @@ -224,27 +224,6 @@ ATF_TEST_CASE_BODY(expect_timeout_but_pass) expect_timeout("Will just exit"); } -// ------------------------------------------------------------------------ -// Helper tests for "t_fork". -// ------------------------------------------------------------------------ - -ATF_TEST_CASE(fork_stop); -ATF_TEST_CASE_HEAD(fork_stop) -{ - set_md_var("descr", "Helper test case for the t_fork test program"); -} -ATF_TEST_CASE_BODY(fork_stop) -{ - std::ofstream os(get_config_var("pidfile").c_str()); - os << ::getpid() << "\n"; - os.close(); - std::cout << "Wrote pid file\n"; - std::cout << "Waiting for done file\n"; - while (::access(get_config_var("donefile").c_str(), F_OK) != 0) - ::usleep(10000); - std::cout << "Exiting\n"; -} - // ------------------------------------------------------------------------ // Helper tests for "t_meta_data". // ------------------------------------------------------------------------ @@ -363,9 +342,6 @@ ATF_INIT_TEST_CASES(tcs) ATF_ADD_TEST_CASE(tcs, expect_timeout_and_hang); ATF_ADD_TEST_CASE(tcs, expect_timeout_but_pass); - // Add helper tests for t_fork. - ATF_ADD_TEST_CASE(tcs, fork_stop); - // Add helper tests for t_meta_data. ATF_ADD_TEST_CASE(tcs, metadata_no_descr); ATF_ADD_TEST_CASE(tcs, metadata_no_head); -- cgit v1.2.3