diff options
Diffstat (limited to 'contrib/atf/test-programs')
| -rw-r--r-- | contrib/atf/test-programs/Atffile | 10 | ||||
| -rw-r--r-- | contrib/atf/test-programs/Kyuafile | 1 | ||||
| -rw-r--r-- | contrib/atf/test-programs/Makefile.am.inc | 102 | ||||
| -rw-r--r-- | contrib/atf/test-programs/c_helpers.c | 51 | ||||
| -rw-r--r-- | contrib/atf/test-programs/cpp_helpers.cpp | 26 | ||||
| -rw-r--r-- | contrib/atf/test-programs/fork_test.sh | 64 | ||||
| -rw-r--r-- | contrib/atf/test-programs/sh_helpers.sh | 39 |
7 files changed, 1 insertions, 292 deletions
diff --git a/contrib/atf/test-programs/Atffile b/contrib/atf/test-programs/Atffile deleted file mode 100644 index 253d3e8..0000000 --- a/contrib/atf/test-programs/Atffile +++ /dev/null @@ -1,10 +0,0 @@ -Content-Type: application/X-atf-atffile; version="1" - -prop: test-suite = atf - -tp: config_test -tp: expect_test -tp: fork_test -tp: meta_data_test -tp: srcdir_test -tp: result_test diff --git a/contrib/atf/test-programs/Kyuafile b/contrib/atf/test-programs/Kyuafile index de3245d..e525282 100644 --- a/contrib/atf/test-programs/Kyuafile +++ b/contrib/atf/test-programs/Kyuafile @@ -4,7 +4,6 @@ test_suite("atf") atf_test_program{name="config_test"} atf_test_program{name="expect_test"} -atf_test_program{name="fork_test"} atf_test_program{name="meta_data_test"} atf_test_program{name="srcdir_test"} atf_test_program{name="result_test"} diff --git a/contrib/atf/test-programs/Makefile.am.inc b/contrib/atf/test-programs/Makefile.am.inc deleted file mode 100644 index 1d88601..0000000 --- a/contrib/atf/test-programs/Makefile.am.inc +++ /dev/null @@ -1,102 +0,0 @@ -# -# Automated Testing Framework (atf) -# -# Copyright (c) 2007 The NetBSD Foundation, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -tests_test_programs_DATA = test-programs/Atffile \ - test-programs/Kyuafile -tests_test_programsdir = $(pkgtestsdir)/test-programs -EXTRA_DIST += $(tests_test_programs_DATA) - -tests_test_programs_PROGRAMS = test-programs/c_helpers -test_programs_c_helpers_SOURCES = test-programs/c_helpers.c -test_programs_c_helpers_LDADD = libatf-c.la - -tests_test_programs_PROGRAMS += test-programs/cpp_helpers -test_programs_cpp_helpers_SOURCES = test-programs/cpp_helpers.cpp -test_programs_cpp_helpers_LDADD = $(ATF_CXX_LIBS) - -common_sh = $(srcdir)/test-programs/common.sh -EXTRA_DIST += test-programs/common.sh - -tests_test_programs_SCRIPTS = test-programs/sh_helpers -CLEANFILES += test-programs/sh_helpers -EXTRA_DIST += test-programs/sh_helpers.sh -test-programs/sh_helpers: $(srcdir)/test-programs/sh_helpers.sh - test -d test-programs || mkdir -p test-programs - @src="$(srcdir)/test-programs/sh_helpers.sh $(common_sh)"; \ - dst="test-programs/sh_helpers"; $(BUILD_SH_TP) - -tests_test_programs_SCRIPTS += test-programs/config_test -CLEANFILES += test-programs/config_test -EXTRA_DIST += test-programs/config_test.sh -test-programs/config_test: $(srcdir)/test-programs/config_test.sh - test -d test-programs || mkdir -p test-programs - @src="$(srcdir)/test-programs/config_test.sh $(common_sh)"; \ - dst="test-programs/config_test"; $(BUILD_SH_TP) - -tests_test_programs_SCRIPTS += test-programs/expect_test -CLEANFILES += test-programs/expect_test -EXTRA_DIST += test-programs/expect_test.sh -test-programs/expect_test: $(srcdir)/test-programs/expect_test.sh - test -d test-programs || mkdir -p test-programs - @src="$(srcdir)/test-programs/expect_test.sh $(common_sh)"; \ - dst="test-programs/expect_test"; $(BUILD_SH_TP) - -tests_test_programs_SCRIPTS += test-programs/fork_test -CLEANFILES += test-programs/fork_test -EXTRA_DIST += test-programs/fork_test.sh -test-programs/fork_test: $(srcdir)/test-programs/fork_test.sh - test -d test-programs || mkdir -p test-programs - @src="$(srcdir)/test-programs/fork_test.sh $(common_sh)"; \ - dst="test-programs/fork_test"; $(BUILD_SH_TP) - -tests_test_programs_SCRIPTS += test-programs/meta_data_test -CLEANFILES += test-programs/meta_data_test -EXTRA_DIST += test-programs/meta_data_test.sh -test-programs/meta_data_test: $(srcdir)/test-programs/meta_data_test.sh - test -d test-programs || mkdir -p test-programs - @src="$(srcdir)/test-programs/meta_data_test.sh $(common_sh)"; \ - dst="test-programs/meta_data_test"; $(BUILD_SH_TP) - -tests_test_programs_SCRIPTS += test-programs/result_test -CLEANFILES += test-programs/result_test -EXTRA_DIST += test-programs/result_test.sh -test-programs/result_test: $(srcdir)/test-programs/result_test.sh - test -d test-programs || mkdir -p test-programs - @src="$(srcdir)/test-programs/result_test.sh $(common_sh)"; \ - dst="test-programs/result_test"; $(BUILD_SH_TP) - -tests_test_programs_SCRIPTS += test-programs/srcdir_test -CLEANFILES += test-programs/srcdir_test -EXTRA_DIST += test-programs/srcdir_test.sh -test-programs/srcdir_test: $(srcdir)/test-programs/srcdir_test.sh - test -d test-programs || mkdir -p test-programs - @src="$(srcdir)/test-programs/srcdir_test.sh $(common_sh)"; \ - dst="test-programs/srcdir_test"; $(BUILD_SH_TP) - -# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8 diff --git a/contrib/atf/test-programs/c_helpers.c b/contrib/atf/test-programs/c_helpers.c index 95cde6f..ac9bcc3 100644 --- a/contrib/atf/test-programs/c_helpers.c +++ b/contrib/atf/test-programs/c_helpers.c @@ -177,22 +177,6 @@ ATF_TC_CLEANUP(cleanup_sigterm, tc) safe_remove(atf_tc_get_config_var(tc, "tmpfile")); } -ATF_TC_WITH_CLEANUP(cleanup_fork); -ATF_TC_HEAD(cleanup_fork, tc) -{ - atf_tc_set_md_var(tc, "descr", "Helper test case for the t_cleanup test " - "program"); -} -ATF_TC_BODY(cleanup_fork, tc) -{ -} -ATF_TC_CLEANUP(cleanup_fork, tc) -{ - close(STDOUT_FILENO); - close(STDERR_FILENO); - close(3); -} - /* --------------------------------------------------------------------- * Helper tests for "t_config". * --------------------------------------------------------------------- */ @@ -386,37 +370,6 @@ ATF_TC_BODY(expect_timeout_but_pass, tc) } /* --------------------------------------------------------------------- - * Helper tests for "t_fork". - * --------------------------------------------------------------------- */ - -ATF_TC(fork_stop); -ATF_TC_HEAD(fork_stop, tc) -{ - atf_tc_set_md_var(tc, "descr", "Helper test case for the t_fork test " - "program"); -} -ATF_TC_BODY(fork_stop, tc) -{ - FILE *f; - const char *dfstr, *pfstr; - - dfstr = atf_tc_get_config_var(tc, "donefile"); - pfstr = atf_tc_get_config_var(tc, "pidfile"); - - f = fopen(pfstr, "w"); - if (f == NULL) - atf_tc_fail("Failed to create pidfile %s", pfstr); - fprintf(f, "%d", (int)getpid()); - fclose(f); - printf("Wrote pid file\n"); - - printf("Waiting for done file\n"); - while (access(dfstr, F_OK) != 0) - usleep(10000); - printf("Exiting\n"); -} - -/* --------------------------------------------------------------------- * Helper tests for "t_meta_data". * --------------------------------------------------------------------- */ @@ -511,7 +464,6 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, cleanup_skip); ATF_TP_ADD_TC(tp, cleanup_curdir); ATF_TP_ADD_TC(tp, cleanup_sigterm); - ATF_TP_ADD_TC(tp, cleanup_fork); /* Add helper tests for t_config. */ ATF_TP_ADD_TC(tp, config_unset); @@ -538,9 +490,6 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, expect_timeout_and_hang); ATF_TP_ADD_TC(tp, expect_timeout_but_pass); - /* Add helper tests for t_fork. */ - ATF_TP_ADD_TC(tp, fork_stop); - /* Add helper tests for t_meta_data. */ ATF_TP_ADD_TC(tp, metadata_no_descr); ATF_TP_ADD_TC(tp, metadata_no_head); diff --git a/contrib/atf/test-programs/cpp_helpers.cpp b/contrib/atf/test-programs/cpp_helpers.cpp index 4487aef..d8a495e 100644 --- a/contrib/atf/test-programs/cpp_helpers.cpp +++ b/contrib/atf/test-programs/cpp_helpers.cpp @@ -36,7 +36,7 @@ extern "C" { #include <fstream> #include <iostream> -#include "atf-c++/macros.hpp" +#include <atf-c++.hpp> #include "atf-c++/detail/fs.hpp" @@ -225,27 +225,6 @@ ATF_TEST_CASE_BODY(expect_timeout_but_pass) } // ------------------------------------------------------------------------ -// 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); diff --git a/contrib/atf/test-programs/fork_test.sh b/contrib/atf/test-programs/fork_test.sh deleted file mode 100644 index 70f6118..0000000 --- a/contrib/atf/test-programs/fork_test.sh +++ /dev/null @@ -1,64 +0,0 @@ -# -# Automated Testing Framework (atf) -# -# Copyright (c) 2007 The NetBSD Foundation, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND -# CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -# TODO: This test program is about checking the test case's "environment" -# (not the variables). Should be named something else than t_fork. - -atf_test_case stop -stop_head() -{ - atf_set "descr" "Tests that sending a stop signal to a test case does" \ - "not report it as failed" -} -stop_body() -{ - for h in $(get_helpers); do - ${h} -s $(atf_get_srcdir) -v pidfile=$(pwd)/pid \ - -v donefile=$(pwd)/done -r resfile fork_stop & - ppid=${!} - echo "Waiting for pid file for test program ${ppid}" - while test ! -f pid; do sleep 1; done - pid=$(cat pid) - echo "Test case's pid is ${pid}" - kill -STOP ${pid} - touch done - echo "Wrote done file" - kill -CONT ${pid} - wait ${ppid} - atf_check -s eq:0 -o ignore -e empty grep '^passed$' resfile - rm -f pid done - done -} - -atf_init_test_cases() -{ - atf_add_test_case stop -} - -# vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4 diff --git a/contrib/atf/test-programs/sh_helpers.sh b/contrib/atf/test-programs/sh_helpers.sh index de95882..eb55102 100644 --- a/contrib/atf/test-programs/sh_helpers.sh +++ b/contrib/atf/test-programs/sh_helpers.sh @@ -111,23 +111,6 @@ cleanup_sigterm_cleanup() rm $(atf_config_get tmpfile) } -atf_test_case cleanup_fork cleanup -cleanup_fork_head() -{ - atf_set "descr" "Helper test case for the t_cleanup test program" -} -cleanup_fork_body() -{ - : -} -cleanup_fork_cleanup() -{ - exec 1>out - exec 2>err - exec 3>res - rm -f out err res -} - # ------------------------------------------------------------------------- # Helper tests for "t_config". # ------------------------------------------------------------------------- @@ -175,24 +158,6 @@ config_multi_value_body() } # ------------------------------------------------------------------------- -# Helper tests for "t_fork". -# ------------------------------------------------------------------------- - -atf_test_case fork_stop -fork_stop_head() -{ - atf_set "descr" "Helper test case for the t_fork test program" -} -fork_stop_body() -{ - echo ${$} >$(atf_config_get pidfile) - echo "Wrote pid file" - echo "Waiting for done file" - while ! test -f $(atf_config_get donefile); do sleep 1; done - echo "Exiting" -} - -# ------------------------------------------------------------------------- # Helper tests for "t_expect". # ------------------------------------------------------------------------- @@ -387,7 +352,6 @@ atf_init_test_cases() atf_add_test_case cleanup_skip atf_add_test_case cleanup_curdir atf_add_test_case cleanup_sigterm - atf_add_test_case cleanup_fork # Add helper tests for t_config. atf_add_test_case config_unset @@ -414,9 +378,6 @@ atf_init_test_cases() atf_add_test_case expect_timeout_and_hang atf_add_test_case expect_timeout_but_pass - # Add helper tests for t_fork. - atf_add_test_case fork_stop - # Add helper tests for t_meta_data. atf_add_test_case metadata_no_descr atf_add_test_case metadata_no_head |
