head 1.3; access; symbols perseant-exfatfs-base-20250801:1.3 perseant-exfatfs-base-20240630:1.3 perseant-exfatfs:1.3.0.18 perseant-exfatfs-base:1.3 cjep_sun2x:1.3.0.16 cjep_sun2x-base:1.3 cjep_staticlib_x-base1:1.3 cjep_staticlib_x:1.3.0.14 cjep_staticlib_x-base:1.3 phil-wifi-20200421:1.3 phil-wifi-20200411:1.3 phil-wifi-20200406:1.3 pgoyette-compat-merge-20190127:1.3 pgoyette-compat-20190127:1.3 pgoyette-compat-20190118:1.3 pgoyette-compat-1226:1.3 pgoyette-compat-1126:1.3 pgoyette-compat-1020:1.3 pgoyette-compat-0930:1.3 pgoyette-compat-0906:1.3 pgoyette-compat-0728:1.3 pgoyette-compat-0625:1.3 pgoyette-compat-0521:1.3 pgoyette-compat-0502:1.3 pgoyette-compat-0422:1.3 pgoyette-compat-0415:1.3 pgoyette-compat-0407:1.3 pgoyette-compat-0330:1.3 pgoyette-compat-0322:1.3 pgoyette-compat-0315:1.3 pgoyette-compat:1.3.0.12 pgoyette-compat-base:1.3 perseant-stdc-iso10646:1.3.0.10 perseant-stdc-iso10646-base:1.3 prg-localcount2-base3:1.3 prg-localcount2-base2:1.3 prg-localcount2-base1:1.3 prg-localcount2:1.3.0.8 prg-localcount2-base:1.3 pgoyette-localcount-20170426:1.3 bouyer-socketcan-base1:1.3 pgoyette-localcount-20170320:1.3 bouyer-socketcan:1.3.0.6 bouyer-socketcan-base:1.3 pgoyette-localcount-20170107:1.3 pgoyette-localcount-20161104:1.3 localcount-20160914:1.3 pgoyette-localcount-20160806:1.3 pgoyette-localcount-20160726:1.3 pgoyette-localcount:1.3.0.4 pgoyette-localcount-base:1.3 netbsd-6-0-6-RELEASE:1.2 netbsd-6-1-5-RELEASE:1.2 yamt-pagecache-base9:1.3 yamt-pagecache-tag8:1.2 netbsd-6-1-4-RELEASE:1.2 netbsd-6-0-5-RELEASE:1.2 tls-earlyentropy:1.3.0.2 tls-earlyentropy-base:1.3 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.3 riastradh-drm2-base3:1.3 netbsd-6-1-3-RELEASE:1.2 netbsd-6-0-4-RELEASE:1.2 netbsd-6-1-2-RELEASE:1.2 netbsd-6-0-3-RELEASE:1.2 netbsd-6-1-1-RELEASE:1.2 riastradh-drm2-base2:1.2 riastradh-drm2-base1:1.2 riastradh-drm2:1.2.0.16 riastradh-drm2-base:1.2 netbsd-6-1:1.2.0.22 netbsd-6-0-2-RELEASE:1.2 netbsd-6-1-RELEASE:1.2 khorben-n900:1.2.0.20 netbsd-6-1-RC4:1.2 netbsd-6-1-RC3:1.2 agc-symver:1.2.0.18 agc-symver-base:1.2 netbsd-6-1-RC2:1.2 netbsd-6-1-RC1:1.2 atf-0-17:1.1.1.3 yamt-pagecache-base8:1.2 netbsd-6-0-1-RELEASE:1.2 yamt-pagecache-base7:1.2 matt-nb6-plus-nbase:1.2 yamt-pagecache-base6:1.2 netbsd-6-0:1.2.0.14 netbsd-6-0-RELEASE:1.2 netbsd-6-0-RC2:1.2 tls-maxphys:1.2.0.12 tls-maxphys-base:1.3 matt-nb6-plus:1.2.0.10 matt-nb6-plus-base:1.2 netbsd-6-0-RC1:1.2 atf-0-16:1.1.1.3 yamt-pagecache-base5:1.2 yamt-pagecache-base4:1.2 netbsd-6:1.2.0.8 netbsd-6-base:1.2 atf-0-15:1.1.1.3 yamt-pagecache-base3:1.2 yamt-pagecache-base2:1.2 yamt-pagecache:1.2.0.6 yamt-pagecache-base:1.2 atf-0-14:1.1.1.3 cherry-xenmp:1.2.0.4 cherry-xenmp-base:1.2 atf-0-13:1.1.1.3 bouyer-quota2-nbase:1.2 bouyer-quota2:1.2.0.2 bouyer-quota2-base:1.2 matt-mips64-premerge-20101231:1.2 atf-0-12:1.1.1.2 atf-0-11:1.1.1.2 atf-0-10:1.1.1.1 TNF:1.1.1; locks; strict; comment @// @; 1.3 date 2014.02.08.19.13.44; author jmmv; state dead; branches; next 1.2; commitid V1QGpoY6GYJZzkox; 1.2 date 2010.11.07.17.54.03; author jmmv; state Exp; branches 1.2.6.1 1.2.12.1; next 1.1; 1.1 date 2010.07.03.08.04.53; author jmmv; state Exp; branches 1.1.1.1; next ; 1.2.6.1 date 2014.05.22.15.40.12; author yamt; state dead; branches; next ; commitid TzMwNuE6CLSD5yBx; 1.2.12.1 date 2014.08.19.23.45.53; author tls; state dead; branches; next ; commitid jTnpym9Qu0o4R1Nx; 1.1.1.1 date 2010.07.03.08.04.53; author jmmv; state Exp; branches; next 1.1.1.2; 1.1.1.2 date 2010.10.20.09.14.23; author jmmv; state Exp; branches; next 1.1.1.3; 1.1.1.3 date 2011.03.31.16.41.13; author jmmv; state Exp; branches; next ; desc @@ 1.3 log @Merge atf-0.19. @ text @// // Automated Testing Framework (atf) // // Copyright (c) 2010 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. // #include "atf-c++/detail/env.hpp" #include "atf-c++/detail/test_helpers.hpp" #include "atf-c++/config.hpp" #include "atf-c++/macros.hpp" #include "config.hpp" namespace impl = atf::atf_run; namespace detail = atf::atf_run::detail; using atf::tests::vars_map; namespace atf { namespace config { void __reinit(void); } // namespace config } // namespace atf // ------------------------------------------------------------------------- // Tests for the "config" parser. // ------------------------------------------------------------------------- class config_reader : protected detail::atf_config_reader { void got_var(const std::string& name, const std::string& val) { m_calls.push_back("got_var(" + name + ", " + val + ")"); } void got_eof(void) { m_calls.push_back("got_eof()"); } public: config_reader(std::istream& is) : detail::atf_config_reader(is) { } void read(void) { atf_config_reader::read(); } std::vector< std::string > m_calls; }; ATF_TEST_CASE_WITHOUT_HEAD(config_1); ATF_TEST_CASE_BODY(config_1) { const char* input = "Content-Type: application/X-atf-config; version=\"1\"\n" "\n" ; const char* exp_calls[] = { "got_eof()", NULL }; const char* exp_errors[] = { NULL }; do_parser_test< config_reader >(input, exp_calls, exp_errors); } ATF_TEST_CASE_WITHOUT_HEAD(config_2); ATF_TEST_CASE_BODY(config_2) { const char* input = "Content-Type: application/X-atf-config; version=\"1\"\n" "\n" "# This is a comment on a line of its own.\n" "# And this is another one.\n" "\n" " # Another after some whitespace.\n" "\n" "# The last one after an empty line.\n" ; const char* exp_calls[] = { "got_eof()", NULL }; const char* exp_errors[] = { NULL }; do_parser_test< config_reader >(input, exp_calls, exp_errors); } ATF_TEST_CASE_WITHOUT_HEAD(config_3); ATF_TEST_CASE_BODY(config_3) { const char* input = "Content-Type: application/X-atf-config; version=\"1\"\n" "\n" "var1=value1\n" "var2 = value2\n" "var3 = value3\n" "var4 = value4\n" "\n" "var5=value5\n" " var6=value6\n" "\n" "var7 = \"This is a long value.\"\n" "var8 = \"Single-word\"\n" "var9 = \" Single-word \"\n" "var10 = Single-word\n" ; const char* exp_calls[] = { "got_var(var1, value1)", "got_var(var2, value2)", "got_var(var3, value3)", "got_var(var4, value4)", "got_var(var5, value5)", "got_var(var6, value6)", "got_var(var7, This is a long value.)", "got_var(var8, Single-word)", "got_var(var9, Single-word )", "got_var(var10, Single-word)", "got_eof()", NULL }; const char* exp_errors[] = { NULL }; do_parser_test< config_reader >(input, exp_calls, exp_errors); } ATF_TEST_CASE_WITHOUT_HEAD(config_4); ATF_TEST_CASE_BODY(config_4) { const char* input = "Content-Type: application/X-atf-config; version=\"1\"\n" "\n" "foo = bar # A comment.\n" ; const char* exp_calls[] = { "got_var(foo, bar)", "got_eof()", NULL }; const char* exp_errors[] = { NULL }; do_parser_test< config_reader >(input, exp_calls, exp_errors); } ATF_TEST_CASE_WITHOUT_HEAD(config_50); ATF_TEST_CASE_BODY(config_50) { const char* input = "Content-Type: application/X-atf-config; version=\"1\"\n" "\n" "foo\n" ; const char* exp_calls[] = { NULL }; const char* exp_errors[] = { "3: Unexpected token `<>'; expected equal sign", NULL }; do_parser_test< config_reader >(input, exp_calls, exp_errors); } ATF_TEST_CASE_WITHOUT_HEAD(config_51); ATF_TEST_CASE_BODY(config_51) { const char* input = "Content-Type: application/X-atf-config; version=\"1\"\n" "\n" "foo bar\n" "baz\n" ; const char* exp_calls[] = { NULL }; const char* exp_errors[] = { "3: Unexpected token `bar'; expected equal sign", "4: Unexpected token `<>'; expected equal sign", NULL }; do_parser_test< config_reader >(input, exp_calls, exp_errors); } ATF_TEST_CASE_WITHOUT_HEAD(config_52); ATF_TEST_CASE_BODY(config_52) { const char* input = "Content-Type: application/X-atf-config; version=\"1\"\n" "\n" "foo =\n" "bar = # A comment.\n" ; const char* exp_calls[] = { NULL }; const char* exp_errors[] = { "3: Unexpected token `<>'; expected word or quoted string", "4: Unexpected token `#'; expected word or quoted string", NULL }; do_parser_test< config_reader >(input, exp_calls, exp_errors); } ATF_TEST_CASE_WITHOUT_HEAD(config_53); ATF_TEST_CASE_BODY(config_53) { const char* input = "Content-Type: application/X-atf-config; version=\"1\"\n" "\n" "foo = \"Correct value\" # With comment.\n" "\n" "bar = # A comment.\n" "\n" "baz = \"Last variable\"\n" "\n" "# End of file.\n" ; const char* exp_calls[] = { "got_var(foo, Correct value)", NULL }; const char* exp_errors[] = { "5: Unexpected token `#'; expected word or quoted string", NULL }; do_parser_test< config_reader >(input, exp_calls, exp_errors); } ATF_TEST_CASE_WITHOUT_HEAD(config_54); ATF_TEST_CASE_BODY(config_54) { const char* input = "Content-Type: application/X-atf-config; version=\"1\"\n" "\n" "foo = \"\n" "bar = \"text\n" "baz = \"te\\\"xt\n" "last = \"\\\"\n" ; const char* exp_calls[] = { NULL }; const char* exp_errors[] = { "3: Missing double quotes before end of line", "4: Missing double quotes before end of line", "5: Missing double quotes before end of line", "6: Missing double quotes before end of line", NULL }; do_parser_test< config_reader >(input, exp_calls, exp_errors); } // ------------------------------------------------------------------------- // Tests for the free functions. // ------------------------------------------------------------------------- ATF_TEST_CASE(merge_configs_both_empty); ATF_TEST_CASE_HEAD(merge_configs_both_empty) {} ATF_TEST_CASE_BODY(merge_configs_both_empty) { vars_map lower, upper; ATF_REQUIRE(impl::merge_configs(lower, upper).empty()); } ATF_TEST_CASE(merge_configs_lower_empty); ATF_TEST_CASE_HEAD(merge_configs_lower_empty) {} ATF_TEST_CASE_BODY(merge_configs_lower_empty) { vars_map lower, upper; upper["var"] = "value"; vars_map merged = impl::merge_configs(lower, upper); ATF_REQUIRE_EQ("value", merged["var"]); } ATF_TEST_CASE(merge_configs_upper_empty); ATF_TEST_CASE_HEAD(merge_configs_upper_empty) {} ATF_TEST_CASE_BODY(merge_configs_upper_empty) { vars_map lower, upper; lower["var"] = "value"; vars_map merged = impl::merge_configs(lower, upper); ATF_REQUIRE_EQ("value", merged["var"]); } ATF_TEST_CASE(merge_configs_mixed); ATF_TEST_CASE_HEAD(merge_configs_mixed) {} ATF_TEST_CASE_BODY(merge_configs_mixed) { vars_map lower, upper; lower["var1"] = "value1"; lower["var2"] = "value2-l"; upper["var2"] = "value2-u"; upper["var3"] = "value3"; vars_map merged = impl::merge_configs(lower, upper); ATF_REQUIRE_EQ("value1", merged["var1"]); ATF_REQUIRE_EQ("value2-u", merged["var2"]); ATF_REQUIRE_EQ("value3", merged["var3"]); } ATF_TEST_CASE(read_config_files_none); ATF_TEST_CASE_HEAD(read_config_files_none) {} ATF_TEST_CASE_BODY(read_config_files_none) { atf::env::set("ATF_CONFDIR", "."); atf::config::__reinit(); ATF_REQUIRE(vars_map() == impl::read_config_files("test-suite")); } // ------------------------------------------------------------------------- // Main. // ------------------------------------------------------------------------- ATF_INIT_TEST_CASES(tcs) { ATF_ADD_TEST_CASE(tcs, config_1); ATF_ADD_TEST_CASE(tcs, config_2); ATF_ADD_TEST_CASE(tcs, config_3); ATF_ADD_TEST_CASE(tcs, config_4); ATF_ADD_TEST_CASE(tcs, config_50); ATF_ADD_TEST_CASE(tcs, config_51); ATF_ADD_TEST_CASE(tcs, config_52); ATF_ADD_TEST_CASE(tcs, config_53); ATF_ADD_TEST_CASE(tcs, config_54); ATF_ADD_TEST_CASE(tcs, merge_configs_both_empty); ATF_ADD_TEST_CASE(tcs, merge_configs_lower_empty); ATF_ADD_TEST_CASE(tcs, merge_configs_upper_empty); ATF_ADD_TEST_CASE(tcs, merge_configs_mixed); ATF_ADD_TEST_CASE(tcs, read_config_files_none); } @ 1.2 log @Pull in post-release fix 3d5597b0076ade841abf03fc274da72d17cb3ad6 to resolve issues with the default NetBSD settings. Tests were producing invalid results because they were unexpectedly reading the system-wide settings. @ text @@ 1.2.12.1 log @Rebase to HEAD as of a few days ago. @ text @@ 1.2.6.1 log @sync with head. for a reference, the tree before this commit was tagged as yamt-pagecache-tag8. this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments") @ text @@ 1.1 log @Initial revision @ text @d30 3 a36 2 #include "test_helpers.hpp" d42 8 d323 1 a323 1 ATF_CHECK(impl::merge_configs(lower, upper).empty()); d333 1 a333 1 ATF_CHECK_EQUAL("value", merged["var"]); d343 1 a343 1 ATF_CHECK_EQUAL("value", merged["var"]); d356 3 a358 3 ATF_CHECK_EQUAL("value1", merged["var1"]); ATF_CHECK_EQUAL("value2-u", merged["var2"]); ATF_CHECK_EQUAL("value3", merged["var3"]); d364 3 a366 1 ATF_CHECK(vars_map() == impl::read_config_files("test-suite")); @ 1.1.1.1 log @Import atf 0.10: Miscellaneous features * Added expected failures support to test cases and atf-run. These include, for example, expected clean exits, expected reception of fatal signals, expected timeouts and expected errors in condition checks. These statuses can be used to denote test cases that are known to fail due to a bug in the code they are testing. atf-report reports these tests separately but they do not count towards the failed test cases amount. * Added the ATF_CHECK_ERRNO and ATF_REQUIRE_ERRNO to the C library to allow easy checking of call failures that update errno. * Added the has.cleanup meta-data property to test caes that specifies whether the test case has a cleanup routine or not; its value is automatically set. This property is read by atf-run to know if it has to run the cleanup routine; skipping this run for every test case significantly speeds up the run time of test suites. * Reversed the order of the ATF_CHECK_THROW macro in the C++ binding to take the expected exception as the first argument and the statement to execute as the second argument. Changes in atf-check * Changed atf-check to support negating the status and output checks by prefixing them with not- and added support to specify multiple checkers for stdout and stderr, not only one. * Added the match output checker to atf-check to look for regular expressions in the stdout and stderr of commands. * Modified the exit checks in atf-check to support checking for the reception of signals. Code simplifications and cleanups * Removed usage messages from test programs to simplify the implementation of every binding by a significant amount. They just now refer the user to the appropriate manual page and do not attempt to wrap lines on terminal boundaries. Test programs are not supposed to be run by users directly so this minor interface regression is not important. * Removed the atf-format internal utility, which is unused after the change documented above. * Removed the atf-cleanup internal utility. It has been unused since the test case isolation was moved to atf-run in 0.8 * Splitted the Makefile.am into smaller files for easier maintenance and dropped the use of M4. Only affects users building from the repository sources. * Intermixed tests with the source files in the source tree to provide them more visibility and easier access. The tests directory is gone from the source tree and tests are now suffixed by _test, not prefixed by t_. * Simplifications to the atf-c library: removed the io, tcr and ui modules as they had become unnecessary after all simplifications introduced since the 0.8 release. * Removed the application/X-atf-tcr format introduced in 0.8 release. Tests now print a much simplified format that is easy to parse and nicer to read by end users. As a side effect, the default for test cases is now to print their results to stdout unless otherwise stated by providing the -r flag. * Removed XML distribution documents and replaced them with plain-text documents. They provided little value and introduced a lot of complexity to the build system. * Simplified the output of atf-version by not attempting to print a revision number when building form a distfile. Makes the build system easier to maintain. @ text @@ 1.1.1.2 log @Import atf-0.11: Experimental version released on October 20th, 2010. * The ATF_CHECK* macros in atf-c++ were renamed to ATF_REQUIRE* to match their counterparts in atf-c. * Clearly separated the modules in atf-c that are supposed to be public from those that are implementation details. The header files for the internal modules are not installed any more. * Made the atf-check tool private. It is only required by atf-sh and being public has the danger of causing confusion. Also, making it private simplifies the public API of atf. * Changed atf-sh to enable per-command error checking (set -e) by default. This catches many cases in which a test case is broken but it is not reported as such because execution continues. * Fixed the XSTL and CSS stylesheets to support expected failures. @ text @a29 1 #include "atf-c++/detail/test_helpers.hpp" d34 2 d314 1 a314 1 ATF_REQUIRE(impl::merge_configs(lower, upper).empty()); d324 1 a324 1 ATF_REQUIRE_EQ("value", merged["var"]); d334 1 a334 1 ATF_REQUIRE_EQ("value", merged["var"]); d347 3 a349 3 ATF_REQUIRE_EQ("value1", merged["var1"]); ATF_REQUIRE_EQ("value2-u", merged["var2"]); ATF_REQUIRE_EQ("value3", merged["var3"]); d355 1 a355 1 ATF_REQUIRE(vars_map() == impl::read_config_files("test-suite")); @ 1.1.1.3 log @Import atf-0.13: Experimental version released on March 31st, 2011. This is the first release after the creation of the Kyua project, a more modular and reliable replacement for ATF. From now on, ATF will change to accomodate the transition to this new codebase, but ATF will still continue to see development in the short/medium term. Check out the project page at http://code.google.com/p/kyua/ for more details. The changes in this release are: * Added support to run the tests with the Kyua runtime engine (kyua-cli), a new package that aims to replace atf-run and atf-report. The ATF tests can be run with the new system by issuing a 'make installcheck-kyua' from the top-level directory of the project (assuming the 'kyua' binary is available during the configuration stage of ATF). * atf-run and atf-report are now in maintenance mode (but *not* deprecated yet!). Kyua already implements a new, much more reliable runtime engine that provides similar features to these tools. That said, it is not complete yet so all development efforts should go towards it. * If GDB is installed, atf-run dumps the stack trace of crashing test programs in an attempt to aid debugging. Contributed by Antti Kantee. * Reverted default timeout change in previous release and reset its value to 5 minutes. This was causing several issues, specially when running the existing NetBSD test suite in qemu. * Fixed the 'match' output checker in atf-check to properly validate the last line of a file even if it does not have a newline. * Added the ATF_REQUIRE_IN and ATF_REQUIRE_NOT_IN macros to atf-c++ to check for the presence (or lack thereof) of an element in a collection. * PR bin/44176: Fixed a race condition in atf-run that would crash atf-run when the cleanup of a test case triggered asynchronous modifications to its work directory (e.g. killing a daemon process that cleans up a pid file in the work directory). * PR bin/44301: Fixed the sample XSLT file to report bogus test programs instead of just listing them as having 0 test cases. @ text @a29 1 #include "atf-c++/detail/env.hpp" a30 1 #include "atf-c++/config.hpp" a39 8 namespace atf { namespace config { void __reinit(void); } // namespace config } // namespace atf a353 2 atf::env::set("ATF_CONFDIR", "."); atf::config::__reinit(); @