diff options
author | jmmv <jmmv@FreeBSD.org> | 2013-12-29 02:57:10 +0000 |
---|---|---|
committer | jmmv <jmmv@FreeBSD.org> | 2013-12-29 02:57:10 +0000 |
commit | 2cc168fb9fc9be682ff4c984b6306ddfe22c033d (patch) | |
tree | 65f81fcb32677687d7156f496d0c2c2b05ab505c /contrib/atf/atf-run/config.hpp | |
parent | 17b80845b0ba13495186831d3505af8c20eeb6ac (diff) | |
download | FreeBSD-src-2cc168fb9fc9be682ff4c984b6306ddfe22c033d.zip FreeBSD-src-2cc168fb9fc9be682ff4c984b6306ddfe22c033d.tar.gz |
Update atf to 0.18 and remove the code of the deprecated tools.
This is a MFC into stable/10 of:
- r258286 Update notes for imports of atf.
- r258289 MFV: Import atf-0.18.
- r258290 Drop all ATF tools code.
This is "make tinderbox" clean as run on ref10-amd64 with the default
WITHOUT_TESTS option. A "make buildworld" with WITH_TESTS set now works
as well.
Diffstat (limited to 'contrib/atf/atf-run/config.hpp')
-rw-r--r-- | contrib/atf/atf-run/config.hpp | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/contrib/atf/atf-run/config.hpp b/contrib/atf/atf-run/config.hpp deleted file mode 100644 index 2cefec9..0000000 --- a/contrib/atf/atf-run/config.hpp +++ /dev/null @@ -1,61 +0,0 @@ -// -// 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 <string> -#include <vector> - -#include "atf-c++/tests.hpp" - -namespace atf { -namespace atf_run { - -namespace detail { - -class atf_config_reader { - std::istream& m_is; - -protected: - virtual void got_var(const std::string&, const std::string &); - virtual void got_eof(void); - -public: - atf_config_reader(std::istream&); - virtual ~atf_config_reader(void); - - void read(void); -}; - -} // namespace detail - -atf::tests::vars_map merge_configs(const atf::tests::vars_map&, - const atf::tests::vars_map&); -atf::tests::vars_map read_config_files(const std::string&); - -} // namespace atf_run -} // namespace atf |