Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/atf/dist Resolve import conflicts.
details: https://anonhg.NetBSD.org/src/rev/e4781c352baa
branches: trunk
changeset: 758118:e4781c352baa
user: jmmv <jmmv%NetBSD.org@localhost>
date: Wed Oct 20 09:17:21 2010 +0000
description:
Resolve import conflicts.
diffstat:
external/bsd/atf/dist/atf-c++/application.cpp | 335 -----
external/bsd/atf/dist/atf-c++/application.hpp | 115 -
external/bsd/atf/dist/atf-c++/application_test.cpp | 48 -
external/bsd/atf/dist/atf-c++/env.cpp | 72 -
external/bsd/atf/dist/atf-c++/env.hpp | 84 -
external/bsd/atf/dist/atf-c++/env_test.cpp | 101 -
external/bsd/atf/dist/atf-c++/exceptions.cpp | 156 --
external/bsd/atf/dist/atf-c++/exceptions.hpp | 98 -
external/bsd/atf/dist/atf-c++/exceptions_test.cpp | 157 --
external/bsd/atf/dist/atf-c++/expand.cpp | 81 -
external/bsd/atf/dist/atf-c++/expand.hpp | 82 -
external/bsd/atf/dist/atf-c++/expand_test.cpp | 282 ----
external/bsd/atf/dist/atf-c++/fs.cpp | 574 ---------
external/bsd/atf/dist/atf-c++/fs.hpp | 457 -------
external/bsd/atf/dist/atf-c++/fs_test.cpp | 706 -----------
external/bsd/atf/dist/atf-c++/io.cpp | 471 -------
external/bsd/atf/dist/atf-c++/io.hpp | 659 ----------
external/bsd/atf/dist/atf-c++/io_test.cpp | 587 ---------
external/bsd/atf/dist/atf-c++/parser.cpp | 384 ------
external/bsd/atf/dist/atf-c++/parser.hpp | 607 ---------
external/bsd/atf/dist/atf-c++/parser_test.cpp | 1050 -----------------
external/bsd/atf/dist/atf-c++/process.cpp | 331 -----
external/bsd/atf/dist/atf-c++/process.hpp | 263 ----
external/bsd/atf/dist/atf-c++/process_test.cpp | 367 ------
external/bsd/atf/dist/atf-c++/sanity.hpp | 37 -
external/bsd/atf/dist/atf-c++/sanity_test.cpp | 48 -
external/bsd/atf/dist/atf-c++/signals.cpp | 135 --
external/bsd/atf/dist/atf-c++/signals.hpp | 89 -
external/bsd/atf/dist/atf-c++/signals_test.cpp | 283 ----
external/bsd/atf/dist/atf-c++/test_helpers.cpp | 122 --
external/bsd/atf/dist/atf-c++/test_helpers.hpp | 187 ---
external/bsd/atf/dist/atf-c++/tests.cpp | 162 +-
external/bsd/atf/dist/atf-c++/tests.hpp | 19 +-
external/bsd/atf/dist/atf-c++/text.cpp | 134 --
external/bsd/atf/dist/atf-c++/text.hpp | 144 --
external/bsd/atf/dist/atf-c++/text_test.cpp | 375 ------
external/bsd/atf/dist/atf-c++/ui.cpp | 172 --
external/bsd/atf/dist/atf-c++/ui.hpp | 105 -
external/bsd/atf/dist/atf-c++/ui_test.cpp | 471 -------
external/bsd/atf/dist/atf-c++/user.cpp | 62 -
external/bsd/atf/dist/atf-c++/user.hpp | 48 -
external/bsd/atf/dist/atf-c++/user_test.cpp | 152 --
external/bsd/atf/dist/atf-c/dynstr.c | 397 ------
external/bsd/atf/dist/atf-c/dynstr.h | 81 -
external/bsd/atf/dist/atf-c/dynstr_test.c | 647 ----------
external/bsd/atf/dist/atf-c/env.c | 107 -
external/bsd/atf/dist/atf-c/env.h | 42 -
external/bsd/atf/dist/atf-c/env_test.c | 126 --
external/bsd/atf/dist/atf-c/fs.c | 886 --------------
external/bsd/atf/dist/atf-c/fs.h | 132 --
external/bsd/atf/dist/atf-c/fs_test.c | 1106 ------------------
external/bsd/atf/dist/atf-c/list.c | 361 -----
external/bsd/atf/dist/atf-c/list.h | 114 -
external/bsd/atf/dist/atf-c/list_test.c | 336 -----
external/bsd/atf/dist/atf-c/map.c | 313 -----
external/bsd/atf/dist/atf-c/map.h | 116 -
external/bsd/atf/dist/atf-c/map_test.c | 331 -----
external/bsd/atf/dist/atf-c/process.c | 661 ----------
external/bsd/atf/dist/atf-c/process.h | 133 --
external/bsd/atf/dist/atf-c/process_helpers.c | 117 -
external/bsd/atf/dist/atf-c/process_test.c | 1159 -------------------
external/bsd/atf/dist/atf-c/sanity.c | 78 -
external/bsd/atf/dist/atf-c/sanity.h | 73 -
external/bsd/atf/dist/atf-c/sanity_test.c | 263 ----
external/bsd/atf/dist/atf-c/tc.c | 157 +-
external/bsd/atf/dist/atf-c/test_helpers.c | 214 ---
external/bsd/atf/dist/atf-c/test_helpers.h | 77 -
external/bsd/atf/dist/atf-c/test_helpers_test.c | 188 ---
external/bsd/atf/dist/atf-c/text.c | 183 ---
external/bsd/atf/dist/atf-c/text.h | 48 -
external/bsd/atf/dist/atf-c/text_test.c | 434 -------
external/bsd/atf/dist/atf-c/tp_main.c | 578 ---------
external/bsd/atf/dist/atf-c/user.c | 78 -
external/bsd/atf/dist/atf-c/user.h | 49 -
external/bsd/atf/dist/atf-c/user_test.c | 151 --
external/bsd/atf/dist/atf-check/Atffile | 5 -
external/bsd/atf/dist/atf-check/atf-check.1 | 151 --
external/bsd/atf/dist/atf-check/atf-check.cpp | 735 ------------
external/bsd/atf/dist/atf-check/integration_test.sh | 462 -------
external/bsd/atf/dist/atf-report/atf-report.cpp | 122 +-
external/bsd/atf/dist/atf-report/tests-results.css | 2 +-
external/bsd/atf/dist/atf-report/tests-results.xsl | 124 +-
external/bsd/atf/dist/atf-run/atf-run.cpp | 24 +-
external/bsd/atf/dist/atf-run/test-program.cpp | 139 +-
external/bsd/atf/dist/atf-run/test-program.hpp | 7 +-
external/bsd/atf/dist/atf-version/atf-version.cpp | 4 +-
86 files changed, 408 insertions(+), 21915 deletions(-)
diffs (truncated from 23461 to 300 lines):
diff -r cf2817bd2e08 -r e4781c352baa external/bsd/atf/dist/atf-c++/application.cpp
--- a/external/bsd/atf/dist/atf-c++/application.cpp Wed Oct 20 09:14:17 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,335 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// Copyright (c) 2007, 2008, 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.
-//
-
-#if defined(HAVE_CONFIG_H)
-#include "bconfig.h"
-#endif
-
-extern "C" {
-#include <unistd.h>
-}
-
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <iostream>
-
-#include "atf-c++/application.hpp"
-#include "atf-c++/sanity.hpp"
-#include "atf-c++/ui.hpp"
-
-#if !defined(HAVE_VSNPRINTF_IN_STD)
-namespace std {
-using ::vsnprintf;
-}
-#endif // !defined(HAVE_VSNPRINTF_IN_STD)
-
-namespace impl = atf::application;
-#define IMPL_NAME "atf::application"
-
-// ------------------------------------------------------------------------
-// The "usage_error" class.
-// ------------------------------------------------------------------------
-
-impl::usage_error::usage_error(const char *fmt, ...)
- throw() :
- std::runtime_error("usage_error; message unformatted")
-{
- va_list ap;
-
- va_start(ap, fmt);
- std::vsnprintf(m_text, sizeof(m_text), fmt, ap);
- va_end(ap);
-}
-
-impl::usage_error::~usage_error(void)
- throw()
-{
-}
-
-const char*
-impl::usage_error::what(void)
- const throw()
-{
- return m_text;
-}
-
-// ------------------------------------------------------------------------
-// The "application" class.
-// ------------------------------------------------------------------------
-
-impl::option::option(char ch,
- const std::string& a,
- const std::string& desc) :
- m_character(ch),
- m_argument(a),
- m_description(desc)
-{
-}
-
-bool
-impl::option::operator<(const impl::option& o)
- const
-{
- return m_character < o.m_character;
-}
-
-impl::app::app(const std::string& description,
- const std::string& manpage,
- const std::string& global_manpage,
- const bool use_ui) :
- m_hflag(false),
- m_argc(-1),
- m_argv(NULL),
- m_prog_name(NULL),
- m_description(description),
- m_manpage(manpage),
- m_global_manpage(global_manpage),
- m_use_ui(use_ui)
-{
-}
-
-impl::app::~app(void)
-{
-}
-
-bool
-impl::app::inited(void)
-{
- return m_argc != -1;
-}
-
-impl::app::options_set
-impl::app::options(void)
-{
- options_set opts = specific_options();
- if (m_use_ui) {
- opts.insert(option('h', "", "Shows this help message"));
- }
- return opts;
-}
-
-std::string
-impl::app::specific_args(void)
- const
-{
- return "";
-}
-
-impl::app::options_set
-impl::app::specific_options(void)
- const
-{
- return options_set();
-}
-
-void
-impl::app::process_option(int ch, const char* arg)
-{
-}
-
-void
-impl::app::process_options(void)
-{
- PRE(inited());
-
- std::string optstr;
-#if defined(HAVE_GNU_GETOPT)
- optstr += '+'; // Turn on POSIX behavior.
-#endif
- optstr += ':';
- {
- options_set opts = options();
- for (options_set::const_iterator iter = opts.begin();
- iter != opts.end(); iter++) {
- const option& opt = (*iter);
-
- optstr += opt.m_character;
- if (!opt.m_argument.empty())
- optstr += ':';
- }
- }
-
- int ch;
- ::opterr = 0;
- while ((ch = ::getopt(m_argc, m_argv, optstr.c_str())) != -1) {
- switch (ch) {
- case 'h':
- INV(m_use_ui);
- m_hflag = true;
- break;
-
- case ':':
- throw usage_error("Option -%c requires an argument.",
- ::optopt);
-
- case '?':
- throw usage_error("Unknown option -%c.", ::optopt);
-
- default:
- process_option(ch, ::optarg);
- }
- }
- m_argc -= ::optind;
- m_argv += ::optind;
-}
-
-void
-impl::app::usage(std::ostream& os)
-{
- PRE(inited());
-
- std::string args = specific_args();
- if (!args.empty())
- args = " " + args;
- os << ui::format_text_with_tag(std::string(m_prog_name) + " [options]" +
- args, "Usage: ", false) << std::endl
- << std::endl
- << ui::format_text(m_description) << std::endl
- << std::endl;
-
- options_set opts = options();
- INV(!opts.empty());
- os << "Available options:" << std::endl;
- size_t coldesc = 0;
- for (options_set::const_iterator iter = opts.begin();
- iter != opts.end(); iter++) {
- const option& opt = (*iter);
-
- if (opt.m_argument.length() + 1 > coldesc)
- coldesc = opt.m_argument.length() + 1;
- }
- for (options_set::const_iterator iter = opts.begin();
- iter != opts.end(); iter++) {
- const option& opt = (*iter);
-
- std::string tag = std::string(" -") + opt.m_character;
- if (opt.m_argument.empty())
- tag += " ";
- else
- tag += " " + opt.m_argument + " ";
- os << ui::format_text_with_tag(opt.m_description, tag, false,
- coldesc + 10)
- << std::endl;
- }
- os << std::endl;
-
- std::string gmp;
- if (!m_global_manpage.empty())
- gmp = " and " + m_global_manpage;
- os << ui::format_text("For more details please see " + m_manpage +
- gmp + ".")
- << std::endl;
-}
-
-int
-impl::app::run(int argc, char* const* argv)
-{
- PRE(argc > 0);
- PRE(argv != NULL);
-
- m_argc = argc;
- m_argv = argv;
-
- m_argv0 = m_argv[0];
-
- m_prog_name = std::strrchr(m_argv[0], '/');
- if (m_prog_name == NULL)
- m_prog_name = m_argv[0];
- else
- m_prog_name++;
-
- // Libtool workaround: if running from within the source tree (binaries
- // that are not installed yet), skip the "lt-" prefix added to files in
- // the ".libs" directory to show the real (not temporary) name.
- if (std::strncmp(m_prog_name, "lt-", 3) == 0)
- m_prog_name += 3;
-
- const std::string bug =
- std::string("This is probably a bug in ") + m_prog_name +
- " or one of the libraries it uses. Please report this problem to "
- PACKAGE_BUGREPORT " and provide as many details as possible "
- "describing how you got to this condition.";
-
- int errcode;
- try {
- int oldargc = m_argc;
-
- process_options();
-
- if (m_hflag) {
- INV(m_use_ui);
- if (oldargc != 2)
- throw usage_error("-h must be given alone.");
-
- usage(std::cout);
- errcode = EXIT_SUCCESS;
- } else
- errcode = main();
- } catch (const usage_error& e) {
Home |
Main Index |
Thread Index |
Old Index