head 1.2; access; symbols perseant-exfatfs-base-20250801:1.2 perseant-exfatfs-base-20240630:1.2 perseant-exfatfs:1.2.0.24 perseant-exfatfs-base:1.2 cjep_sun2x:1.2.0.22 cjep_sun2x-base:1.2 cjep_staticlib_x-base1:1.2 cjep_staticlib_x:1.2.0.20 cjep_staticlib_x-base:1.2 phil-wifi-20200421:1.2 phil-wifi-20200411:1.2 phil-wifi-20200406:1.2 pgoyette-compat-merge-20190127:1.2 pgoyette-compat-20190127:1.2 pgoyette-compat-20190118:1.2 pgoyette-compat-1226:1.2 pgoyette-compat-1126:1.2 pgoyette-compat-1020:1.2 pgoyette-compat-0930:1.2 pgoyette-compat-0906:1.2 pgoyette-compat-0728:1.2 pgoyette-compat-0625:1.2 pgoyette-compat-0521:1.2 pgoyette-compat-0502:1.2 pgoyette-compat-0422:1.2 pgoyette-compat-0415:1.2 pgoyette-compat-0407:1.2 pgoyette-compat-0330:1.2 pgoyette-compat-0322:1.2 pgoyette-compat-0315:1.2 pgoyette-compat:1.2.0.18 pgoyette-compat-base:1.2 perseant-stdc-iso10646:1.2.0.16 perseant-stdc-iso10646-base:1.2 prg-localcount2-base3:1.2 prg-localcount2-base2:1.2 prg-localcount2-base1:1.2 prg-localcount2:1.2.0.14 prg-localcount2-base:1.2 pgoyette-localcount-20170426:1.2 bouyer-socketcan-base1:1.2 pgoyette-localcount-20170320:1.2 bouyer-socketcan:1.2.0.12 bouyer-socketcan-base:1.2 pgoyette-localcount-20170107:1.2 pgoyette-localcount-20161104:1.2 localcount-20160914:1.2 pgoyette-localcount-20160806:1.2 pgoyette-localcount-20160726:1.2 pgoyette-localcount:1.2.0.10 pgoyette-localcount-base:1.2 yamt-pagecache-base9:1.2 yamt-pagecache-tag8:1.2 tls-earlyentropy:1.2.0.6 tls-earlyentropy-base:1.2 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2 riastradh-drm2-base3:1.2 agc-symver:1.2.0.8 agc-symver-base:1.2 tls-maxphys-base:1.2 yamt-pagecache-base8:1.2 yamt-pagecache-base7:1.2 yamt-pagecache-base6:1.2 yamt-pagecache-base5:1.2 yamt-pagecache-base4:1.2 yamt-pagecache-base3:1.2 yamt-pagecache-base2:1.2 yamt-pagecache:1.2.0.4 yamt-pagecache-base:1.2 bouyer-quota2-nbase:1.2 bouyer-quota2:1.2.0.2 bouyer-quota2-base:1.2 atf-0-10:1.1.1.3 atf-0-9:1.1.1.2 atf-0-8:1.1.1.2 atf-0-7:1.1.1.1 matt-premerge-20091211:1.1.1.1 jym-xensuspend-nbase:1.1.1.1 jym-xensuspend:1.1.1.1.0.2 jym-xensuspend-base:1.1.1.1 atf-0-6:1.1.1.1 TNF:1.1.1; locks; strict; comment @// @; 1.2 date 2010.10.20.09.17.23; author jmmv; state dead; branches; next 1.1; 1.1 date 2009.01.19.07.11.51; author jmmv; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2009.01.19.07.11.51; author jmmv; state Exp; branches; next 1.1.1.2; 1.1.1.2 date 2010.05.08.08.05.22; author jmmv; state Exp; branches; next 1.1.1.3; 1.1.1.3 date 2010.07.03.08.04.50; author jmmv; state Exp; branches; next ; desc @@ 1.2 log @Resolve import conflicts. @ text @// // Automated Testing Framework (atf) // // Copyright (c) 2007, 2008 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 #include "atf-c++/parser.hpp" namespace impl = atf::parser; #define IMPL_NAME "atf::parser" // ------------------------------------------------------------------------ // The "parse_error" class. // ------------------------------------------------------------------------ impl::parse_error::parse_error(size_t line, std::string msg) : std::runtime_error(msg), std::pair< size_t, std::string >(line, msg) { } impl::parse_error::~parse_error(void) throw() { } const char* impl::parse_error::what(void) const throw() { try { std::ostringstream oss; oss << "LONELY PARSE ERROR: " << first << ": " << second; m_msg = oss.str(); return m_msg.c_str(); } catch (...) { return "Could not format message for parsing error."; } } // ------------------------------------------------------------------------ // The "parse_errors" class. // ------------------------------------------------------------------------ impl::parse_errors::parse_errors(void) : std::runtime_error("No parsing errors yet") { m_msg.clear(); } impl::parse_errors::~parse_errors(void) throw() { } const char* impl::parse_errors::what(void) const throw() { try { std::ostringstream oss; for (const_iterator iter = begin(); iter != end(); iter++) { oss << (*iter).first << ": " << (*iter).second << std::endl; } m_msg = oss.str(); return m_msg.c_str(); } catch (...) { return "Could not format messages for parsing errors."; } } // ------------------------------------------------------------------------ // The "token" class. // ------------------------------------------------------------------------ impl::token::token(void) : m_inited(false) { } impl::token::token(size_t p_line, const token_type& p_type, const std::string& p_text) : m_inited(true), m_line(p_line), m_type(p_type), m_text(p_text) { } size_t impl::token::lineno(void) const { return m_line; } const impl::token_type& impl::token::type(void) const { return m_type; } const std::string& impl::token::text(void) const { return m_text; } impl::token::operator bool(void) const { return m_inited; } bool impl::token::operator!(void) const { return !m_inited; } @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @Import ATF 0.6. Replaces the old ATF 0.5 that was in dist/atf. Changes in this release: * Make atf-exec be able to kill its child process after a certain period of time; this is controlled through the new -t option. * Change atf-sh to use atf-exec's -t option to control the test case's timeouts, instead of doing it internally. Same behavior as before, but noticeably faster. * atf-exec's -g option and atf-killpg are gone due to the previous change. * Added the atf-check(1) tool, a program that executes a given command and checks its exit code against a known value and allows the management of stdout and stderr in multiple ways. This replaces the previous atf_check function in the atf-sh library and exposes this functionality to both atf-c and atf-c++. * Added the ATF_REQUIRE family of macros to the C interface. These help in checking for fatal test conditions. The old ATF_CHECK macros now perform non-fatal checks only. I.e. by using ATF_CHECK, the test case can now continue its execution and the failures will not be reported until the end of the whole run. * Extended the amount of ATF_CHECK_* C macros with new ones to provide more features to the developer. These also have their corresponding counterparts in the ATF_REQUIRE_* family. The new macros (listing the suffixes only) are: _EQ (replaces _EQUAL), _EQ_MSG, _STREQ and _STREQ_MSG. @ text @@ 1.1.1.2 log @Import atf 0.8. Changes in this release: * Test programs no longer run several test cases in a row. The execution of a test program now requires a test case name, and that single test case is executed. To execute several test cases, use the atf-run utility as usual. * Test programs no longer fork a subprocess to isolate the execution of test cases. They run the test case code in-process, and a crash of the test case will result in a crash of the test program. This is to ease debugging of faulty test cases. * Test programs no longer isolate their test cases. This means that they will not create temporary directories nor sanitize the environment any more. Yes: running a test case that depends on system state by hand will most likely yield different results depending on where (machine, directory, user environment, etc.) it is run. Isolation has been moved to atf-run. * Test programs no longer print a cryptic format (application/X-atf-tcs) on a special file channel. They can now print whatever they want on the screen. Because test programs can now only run one test case every time, providing controlled output is not necessary any more. * Test programs no longer write their status into a special file descriptor. Instead, they create a file with the results, which is later parsed by atf-run. This changes the semantics of the -r flag. * atf-run has been adjusted to perform the test case isolation. As a result, there is now a single canonical place that implements the isolation of test caes. In previous releases, the three language bindings (C, C++ and shell) had to be kept in sync with each other (read: not a nice thing to do at all). As a side effect of this change, writing bindings for other languages will be much, much easier from now on. * atf-run forks test programs on a test case basis, instead of on a test program basis as it did before. This is to provide the test case isolation that was before implemented by the test programs themselves. * Removed the atf-exec tool. This was used to implement test case isolation in atf-sh, but it is now unnecessary. * It is now optional to define the descr meta-data property. It has been proven to be mostly useless, because test cases often carry a descriptive name of their own. @ text @d4 1 a4 1 // Copyright (c) 2007, 2008, 2010 The NetBSD Foundation, Inc. a32 1 #include "atf-c++/text.hpp" a65 6 impl::parse_error::operator std::string(void) const { return atf::text::to_string(first) + ": " + second; } d86 6 a91 1 m_msg = atf::text::join(*this, "\n"); @ 1.1.1.3 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 @a32 1 #include "atf-c++/sanity.hpp" a100 9 // The "format_error" class. // ------------------------------------------------------------------------ impl::format_error::format_error(const std::string& w) : std::runtime_error(w.c_str()) { } // ------------------------------------------------------------------------ a151 223 // ------------------------------------------------------------------------ // The "header_entry" class. // ------------------------------------------------------------------------ impl::header_entry::header_entry(void) { } impl::header_entry::header_entry(const std::string& n, const std::string& v, attrs_map as) : m_name(n), m_value(v), m_attrs(as) { } const std::string& impl::header_entry::name(void) const { return m_name; } const std::string& impl::header_entry::value(void) const { return m_value; } const impl::attrs_map& impl::header_entry::attrs(void) const { return m_attrs; } bool impl::header_entry::has_attr(const std::string& n) const { return m_attrs.find(n) != m_attrs.end(); } const std::string& impl::header_entry::get_attr(const std::string& n) const { attrs_map::const_iterator iter = m_attrs.find(n); PRE(iter != m_attrs.end()); return (*iter).second; } // ------------------------------------------------------------------------ // The header tokenizer. // ------------------------------------------------------------------------ namespace header { static const impl::token_type& eof_type = 0; static const impl::token_type& nl_type = 1; static const impl::token_type& text_type = 2; static const impl::token_type& colon_type = 3; static const impl::token_type& semicolon_type = 4; static const impl::token_type& dblquote_type = 5; static const impl::token_type& equal_type = 6; class tokenizer : public impl::tokenizer< std::istream > { public: tokenizer(std::istream& is, size_t curline) : impl::tokenizer< std::istream > (is, true, eof_type, nl_type, text_type, curline) { add_delim(';', semicolon_type); add_delim(':', colon_type); add_delim('=', equal_type); add_quote('"', dblquote_type); } }; static impl::parser< header::tokenizer >& read(impl::parser< header::tokenizer >& p, impl::header_entry& he) { using namespace header; impl::token t = p.expect(text_type, nl_type, "a header name"); if (t.type() == nl_type) { he = impl::header_entry(); return p; } std::string hdr_name = t.text(); t = p.expect(colon_type, "`:'"); t = p.expect(text_type, "a textual value"); std::string hdr_value = t.text(); impl::attrs_map attrs; for (;;) { t = p.expect(eof_type, semicolon_type, nl_type, "eof, `;' or new line"); if (t.type() == eof_type || t.type() == nl_type) break; t = p.expect(text_type, "an attribute name"); std::string attr_name = t.text(); t = p.expect(equal_type, "`='"); t = p.expect(text_type, "word or quoted string"); std::string attr_value = t.text(); attrs[attr_name] = attr_value; } he = impl::header_entry(hdr_name, hdr_value, attrs); return p; } static std::ostream& write(std::ostream& os, const impl::header_entry& he) { std::string line = he.name() + ": " + he.value(); impl::attrs_map as = he.attrs(); for (impl::attrs_map::const_iterator iter = as.begin(); iter != as.end(); iter++) { PRE((*iter).second.find('\"') == std::string::npos); line += "; " + (*iter).first + "=\"" + (*iter).second + "\""; } os << line << std::endl; return os; } } // namespace header // ------------------------------------------------------------------------ // Free functions. // ------------------------------------------------------------------------ std::pair< size_t, impl::headers_map > impl::read_headers(std::istream& is, size_t curline) { using impl::format_error; headers_map hm; // // Grammar // // header = entry+ nl // entry = line nl // line = text colon text // (semicolon (text equal (text | dblquote string dblquote)))* // string = quoted_string // header::tokenizer tkz(is, curline); impl::parser< header::tokenizer > p(tkz); bool first = true; for (;;) { try { header_entry he; if (!header::read(p, he).good() || he.name().empty()) break; if (first && he.name() != "Content-Type") throw format_error("Could not determine content type"); else first = false; hm[he.name()] = he; } catch (const impl::parse_error& pe) { p.add_error(pe); p.reset(header::nl_type); } } if (!is.good()) throw format_error("Unexpected end of stream"); return std::pair< size_t, headers_map >(tkz.lineno(), hm); } void impl::write_headers(const impl::headers_map& hm, std::ostream& os) { PRE(!hm.empty()); headers_map::const_iterator ct = hm.find("Content-Type"); PRE(ct != hm.end()); header::write(os, (*ct).second); for (headers_map::const_iterator iter = hm.begin(); iter != hm.end(); iter++) { if ((*iter).first != "Content-Type") header::write(os, (*iter).second); } os << std::endl; } void impl::validate_content_type(const impl::headers_map& hm, const std::string& fmt, int version) { using impl::format_error; headers_map::const_iterator iter = hm.find("Content-Type"); if (iter == hm.end()) throw format_error("Could not determine content type"); const header_entry& he = (*iter).second; if (he.value() != fmt) throw format_error("Mismatched content type: expected `" + fmt + "' but got `" + he.value() + "'"); if (!he.has_attr("version")) throw format_error("Could not determine version"); const std::string& vstr = atf::text::to_string(version); if (he.get_attr("version") != vstr) throw format_error("Mismatched version: expected `" + vstr + "' but got `" + he.get_attr("version") + "'"); } @