diff options
Diffstat (limited to 'contrib/atf/atf-c/check_test.c')
| -rw-r--r-- | contrib/atf/atf-c/check_test.c | 50 |
1 files changed, 23 insertions, 27 deletions
diff --git a/contrib/atf/atf-c/check_test.c b/contrib/atf/atf-c/check_test.c index b36dd73..a26e032 100644 --- a/contrib/atf/atf-c/check_test.c +++ b/contrib/atf/atf-c/check_test.c @@ -90,14 +90,10 @@ static void check_line(int fd, const char *exp) { - atf_dynstr_t line; - - atf_dynstr_init(&line); - ATF_CHECK(!read_line(fd, &line)); - ATF_CHECK_MSG(atf_equal_dynstr_cstring(&line, exp), - "read: '%s', expected: '%s'", - atf_dynstr_cstring(&line), exp); - atf_dynstr_fini(&line); + char *line = atf_utils_readline(fd); + ATF_CHECK(line != NULL); + ATF_CHECK_STREQ_MSG(exp, line, "read: '%s', expected: '%s'", line, exp); + free(line); } /* --------------------------------------------------------------------- @@ -246,15 +242,15 @@ ATF_TC_BODY(build_c_o, tc) { init_and_run_h_tc(&ATF_TC_NAME(h_build_c_o_ok), &ATF_TC_PACK_NAME(h_build_c_o_ok), "stdout", "stderr"); - ATF_CHECK(grep_file("stdout", "-o test.o")); - ATF_CHECK(grep_file("stdout", "-c test.c")); + ATF_CHECK(atf_utils_grep_file("-o test.o", "stdout")); + ATF_CHECK(atf_utils_grep_file("-c test.c", "stdout")); init_and_run_h_tc(&ATF_TC_NAME(h_build_c_o_fail), &ATF_TC_PACK_NAME(h_build_c_o_fail), "stdout", "stderr"); - ATF_CHECK(grep_file("stdout", "-o test.o")); - ATF_CHECK(grep_file("stdout", "-c test.c")); - ATF_CHECK(grep_file("stderr", "test.c")); - ATF_CHECK(grep_file("stderr", "UNDEFINED_SYMBOL")); + ATF_CHECK(atf_utils_grep_file("-o test.o", "stdout")); + ATF_CHECK(atf_utils_grep_file("-c test.c", "stdout")); + ATF_CHECK(atf_utils_grep_file("test.c", "stderr")); + ATF_CHECK(atf_utils_grep_file("UNDEFINED_SYMBOL", "stderr")); } ATF_TC(build_cpp); @@ -267,16 +263,16 @@ ATF_TC_BODY(build_cpp, tc) { init_and_run_h_tc(&ATF_TC_NAME(h_build_cpp_ok), &ATF_TC_PACK_NAME(h_build_cpp_ok), "stdout", "stderr"); - ATF_CHECK(grep_file("stdout", "-o.*test.p")); - ATF_CHECK(grep_file("stdout", "test.c")); - ATF_CHECK(grep_file("test.p", "foo bar")); + ATF_CHECK(atf_utils_grep_file("-o.*test.p", "stdout")); + ATF_CHECK(atf_utils_grep_file("test.c", "stdout")); + ATF_CHECK(atf_utils_grep_file("foo bar", "test.p")); init_and_run_h_tc(&ATF_TC_NAME(h_build_cpp_fail), &ATF_TC_PACK_NAME(h_build_cpp_fail), "stdout", "stderr"); - ATF_CHECK(grep_file("stdout", "-o test.p")); - ATF_CHECK(grep_file("stdout", "test.c")); - ATF_CHECK(grep_file("stderr", "test.c")); - ATF_CHECK(grep_file("stderr", "non-existent.h")); + ATF_CHECK(atf_utils_grep_file("-o test.p", "stdout")); + ATF_CHECK(atf_utils_grep_file("test.c", "stdout")); + ATF_CHECK(atf_utils_grep_file("test.c", "stderr")); + ATF_CHECK(atf_utils_grep_file("non-existent.h", "stderr")); } ATF_TC(build_cxx_o); @@ -289,15 +285,15 @@ ATF_TC_BODY(build_cxx_o, tc) { init_and_run_h_tc(&ATF_TC_NAME(h_build_cxx_o_ok), &ATF_TC_PACK_NAME(h_build_cxx_o_ok), "stdout", "stderr"); - ATF_CHECK(grep_file("stdout", "-o test.o")); - ATF_CHECK(grep_file("stdout", "-c test.cpp")); + ATF_CHECK(atf_utils_grep_file("-o test.o", "stdout")); + ATF_CHECK(atf_utils_grep_file("-c test.cpp", "stdout")); init_and_run_h_tc(&ATF_TC_NAME(h_build_cxx_o_fail), &ATF_TC_PACK_NAME(h_build_cxx_o_fail), "stdout", "stderr"); - ATF_CHECK(grep_file("stdout", "-o test.o")); - ATF_CHECK(grep_file("stdout", "-c test.cpp")); - ATF_CHECK(grep_file("stderr", "test.cpp")); - ATF_CHECK(grep_file("stderr", "UNDEFINED_SYMBOL")); + ATF_CHECK(atf_utils_grep_file("-o test.o", "stdout")); + ATF_CHECK(atf_utils_grep_file("-c test.cpp", "stdout")); + ATF_CHECK(atf_utils_grep_file("test.cpp", "stderr")); + ATF_CHECK(atf_utils_grep_file("UNDEFINED_SYMBOL", "stderr")); } ATF_TC(exec_array); |
