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 Import atf 0.15: the major goal of thi...



details:   https://anonhg.NetBSD.org/src/rev/6a1b4c95b7bf
branches:  trunk
changeset: 772796:6a1b4c95b7bf
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Mon Jan 16 22:36:30 2012 +0000

description:
Import atf 0.15: the major goal of this import is to reconcile any local
changes to the atf codebase with upstream code.  All local changes should
have been backported, with appropriate portability workarounds where
necessary.

This new release also includes other changes though, such as performance
improvements and bug fixes, and also a major new feature partially
implemented by pgoyette@: the time to execute each test cases and test
program is now recorded and included in the output reports.

The import into NetBSD has been tested natively on amd64 and macppc, and
the full test suite has also been run through anita on amd64 and i386.
No regressions observed... but you never know.

>From the NEWS file, the changes in this version are as follows:

Experimental version released on January 16th, 2012.

* Respect stdin in atf-check.  The previous release silenced stdin for any
  processes spawned by atf, not only test programs, which caused breakage
  in tests that pipe data through atf-check.

* Performance improvements to atf-sh.

* Enabled detection of unused parameters and variables in the code and
  fixed all warnings.

* Changed the behavior of "developer mode".  Compiler warnings are now
  enabled unconditionally regardless of whether we are in developer mode or
  not; developer mode is now only used to perform strict warning checks and
  to enable assertions.  Additionally, developer mode is now only
  automatically enabled when building from the repository, not for formal
  releases.

* Added new Autoconf M4 macros (ATF_ARG_WITH, ATF_CHECK_C and
  ATF_CHECK_CXX) to provide a consistent way of defining a --with-arg flag
  in configure scripts and detecting the presence of any of the ATF
  bindings.  Note that ATF_CHECK_SH was already introduced in 0.14, but it
  has now been modified to also honor --with-atf if instantiated.

* Added timing support to atf-run / atf-report.

* Added support for a 'require.memory' property, to specify the minimum
  amount of physical memory needed by the test case to yield valid results.

* PR bin/45690: Force an ISO-8859-1 encoding in the XML files generated by
  atf-report so that invalid data in the output of test cases does not
  mangle our report.

diffstat:

 external/bsd/atf/dist/AUTHORS                             |    5 +
 external/bsd/atf/dist/COPYING                             |   32 +-
 external/bsd/atf/dist/NEWS                                |   37 +
 external/bsd/atf/dist/atf-c++.hpp                         |    2 +-
 external/bsd/atf/dist/atf-c++/atf-c++-api.3               |    2 +-
 external/bsd/atf/dist/atf-c++/check.cpp                   |    2 +-
 external/bsd/atf/dist/atf-c++/check.hpp                   |    2 +-
 external/bsd/atf/dist/atf-c++/check_test.cpp              |    2 +-
 external/bsd/atf/dist/atf-c++/config.cpp                  |    2 +-
 external/bsd/atf/dist/atf-c++/config.hpp                  |    2 +-
 external/bsd/atf/dist/atf-c++/config_test.cpp             |    2 +-
 external/bsd/atf/dist/atf-c++/detail/application.cpp      |    9 +-
 external/bsd/atf/dist/atf-c++/detail/application.hpp      |    2 +-
 external/bsd/atf/dist/atf-c++/detail/application_test.cpp |    1 +
 external/bsd/atf/dist/atf-c++/detail/env.cpp              |    2 +-
 external/bsd/atf/dist/atf-c++/detail/env.hpp              |    2 +-
 external/bsd/atf/dist/atf-c++/detail/env_test.cpp         |    2 +-
 external/bsd/atf/dist/atf-c++/detail/exceptions.cpp       |    2 +-
 external/bsd/atf/dist/atf-c++/detail/exceptions.hpp       |    2 +-
 external/bsd/atf/dist/atf-c++/detail/expand.cpp           |    2 +-
 external/bsd/atf/dist/atf-c++/detail/expand.hpp           |    2 +-
 external/bsd/atf/dist/atf-c++/detail/expand_test.cpp      |    2 +-
 external/bsd/atf/dist/atf-c++/detail/fs.cpp               |    2 +-
 external/bsd/atf/dist/atf-c++/detail/fs.hpp               |    2 +-
 external/bsd/atf/dist/atf-c++/detail/fs_test.cpp          |    2 +-
 external/bsd/atf/dist/atf-c++/detail/parser.cpp           |    2 +-
 external/bsd/atf/dist/atf-c++/detail/parser.hpp           |    2 +-
 external/bsd/atf/dist/atf-c++/detail/parser_test.cpp      |    2 +-
 external/bsd/atf/dist/atf-c++/detail/process.cpp          |    2 +-
 external/bsd/atf/dist/atf-c++/detail/process_test.cpp     |    2 +-
 external/bsd/atf/dist/atf-c++/detail/sanity.hpp           |    2 +-
 external/bsd/atf/dist/atf-c++/detail/test_helpers.cpp     |    4 +-
 external/bsd/atf/dist/atf-c++/detail/test_helpers.hpp     |    6 +-
 external/bsd/atf/dist/atf-c++/detail/text_test.cpp        |   27 +-
 external/bsd/atf/dist/atf-c++/detail/ui.cpp               |    2 +-
 external/bsd/atf/dist/atf-c++/detail/ui.hpp               |    2 +-
 external/bsd/atf/dist/atf-c++/macros.hpp                  |    2 +-
 external/bsd/atf/dist/atf-c++/macros_hpp_test.cpp         |    2 +-
 external/bsd/atf/dist/atf-c++/macros_test.cpp             |   52 +-
 external/bsd/atf/dist/atf-c++/pkg_config_test.sh          |    2 +-
 external/bsd/atf/dist/atf-c++/tests_test.cpp              |    2 +-
 external/bsd/atf/dist/atf-c++/utils.hpp                   |    2 +-
 external/bsd/atf/dist/atf-c++/utils_test.cpp              |    8 +-
 external/bsd/atf/dist/atf-c/atf-c-api.3                   |    2 +-
 external/bsd/atf/dist/atf-c/atf_c_test.c                  |    2 +-
 external/bsd/atf/dist/atf-c/check.c                       |    5 +-
 external/bsd/atf/dist/atf-c/check.h                       |    2 +-
 external/bsd/atf/dist/atf-c/check_test.c                  |    2 +-
 external/bsd/atf/dist/atf-c/config.c                      |    2 +-
 external/bsd/atf/dist/atf-c/config_test.c                 |    2 +-
 external/bsd/atf/dist/atf-c/detail/dynstr.c               |    2 +-
 external/bsd/atf/dist/atf-c/detail/dynstr.h               |    2 +-
 external/bsd/atf/dist/atf-c/detail/dynstr_test.c          |    2 +-
 external/bsd/atf/dist/atf-c/detail/env.c                  |    2 +-
 external/bsd/atf/dist/atf-c/detail/env_test.c             |    2 +-
 external/bsd/atf/dist/atf-c/detail/fs.c                   |    5 +-
 external/bsd/atf/dist/atf-c/detail/fs.h                   |    2 +-
 external/bsd/atf/dist/atf-c/detail/fs_test.c              |    2 +-
 external/bsd/atf/dist/atf-c/detail/list.c                 |    2 +-
 external/bsd/atf/dist/atf-c/detail/list.h                 |    2 +-
 external/bsd/atf/dist/atf-c/detail/list_test.c            |    2 +-
 external/bsd/atf/dist/atf-c/detail/map.c                  |    2 +-
 external/bsd/atf/dist/atf-c/detail/map.h                  |    2 +-
 external/bsd/atf/dist/atf-c/detail/map_test.c             |    2 +-
 external/bsd/atf/dist/atf-c/detail/process_helpers.c      |    2 +-
 external/bsd/atf/dist/atf-c/detail/sanity_test.c          |    2 +-
 external/bsd/atf/dist/atf-c/detail/test_helpers.h         |    6 +-
 external/bsd/atf/dist/atf-c/detail/test_helpers_test.c    |    2 +-
 external/bsd/atf/dist/atf-c/detail/text.c                 |    2 +-
 external/bsd/atf/dist/atf-c/detail/text.h                 |    2 +-
 external/bsd/atf/dist/atf-c/detail/text_test.c            |    6 +-
 external/bsd/atf/dist/atf-c/detail/tp_main.c              |    2 +-
 external/bsd/atf/dist/atf-c/detail/user.c                 |    2 +-
 external/bsd/atf/dist/atf-c/detail/user.h                 |    2 +-
 external/bsd/atf/dist/atf-c/detail/user_test.c            |    2 +-
 external/bsd/atf/dist/atf-c/error.c                       |    2 +-
 external/bsd/atf/dist/atf-c/error.h                       |    2 +-
 external/bsd/atf/dist/atf-c/error_test.c                  |    6 +-
 external/bsd/atf/dist/atf-c/macros.h                      |    7 +-
 external/bsd/atf/dist/atf-c/macros_h_test.c               |   14 +-
 external/bsd/atf/dist/atf-c/macros_test.c                 |   12 +-
 external/bsd/atf/dist/atf-c/pkg_config_test.sh            |    2 +-
 external/bsd/atf/dist/atf-c/tc_test.c                     |   10 +-
 external/bsd/atf/dist/atf-c/tp.c                          |    2 +-
 external/bsd/atf/dist/atf-c/tp.h                          |    2 +-
 external/bsd/atf/dist/atf-c/tp_test.c                     |    1 +
 external/bsd/atf/dist/atf-config/atf-config.1             |    2 +-
 external/bsd/atf/dist/atf-config/atf-config.cpp           |    8 +-
 external/bsd/atf/dist/atf-report/atf-report.1             |   12 +-
 external/bsd/atf/dist/atf-report/fail_helper.cpp          |    2 +-
 external/bsd/atf/dist/atf-report/integration_test.sh      |  159 +++--
 external/bsd/atf/dist/atf-report/misc_helpers.cpp         |    2 +-
 external/bsd/atf/dist/atf-report/pass_helper.cpp          |    2 +-
 external/bsd/atf/dist/atf-report/reader.cpp               |   99 +++-
 external/bsd/atf/dist/atf-report/reader.hpp               |   11 +-
 external/bsd/atf/dist/atf-report/reader_test.cpp          |  330 +++++++------
 external/bsd/atf/dist/atf-report/tests-results.dtd        |    2 +-
 external/bsd/atf/dist/atf-run/atf-run.1                   |    2 +-
 external/bsd/atf/dist/atf-run/atffile.cpp                 |   18 +-
 external/bsd/atf/dist/atf-run/atffile.hpp                 |    2 +-
 external/bsd/atf/dist/atf-run/atffile_test.cpp            |    2 +-
 external/bsd/atf/dist/atf-run/config.cpp                  |    9 +-
 external/bsd/atf/dist/atf-run/fs.hpp                      |    2 +-
 external/bsd/atf/dist/atf-run/fs_test.cpp                 |    2 +-
 external/bsd/atf/dist/atf-run/io.cpp                      |    2 +-
 external/bsd/atf/dist/atf-run/io.hpp                      |    2 +-
 external/bsd/atf/dist/atf-run/misc_helpers.cpp            |    2 +-
 external/bsd/atf/dist/atf-run/pass_helper.cpp             |    2 +-
 external/bsd/atf/dist/atf-run/requirements_test.cpp       |   41 +-
 external/bsd/atf/dist/atf-run/several_tcs_helper.c        |    5 +-
 external/bsd/atf/dist/atf-run/share/atf-run.hooks         |    2 +-
 external/bsd/atf/dist/atf-run/signals.cpp                 |    2 +-
 external/bsd/atf/dist/atf-run/signals.hpp                 |    2 +-
 external/bsd/atf/dist/atf-run/signals_test.cpp            |   10 +-
 external/bsd/atf/dist/atf-run/user.cpp                    |    2 +-
 external/bsd/atf/dist/atf-run/user.hpp                    |    2 +-
 external/bsd/atf/dist/atf-run/user_test.cpp               |    2 +-
 external/bsd/atf/dist/atf-run/zero_tcs_helper.c           |    1 +
 external/bsd/atf/dist/atf-sh/atf-check.1                  |    2 +-
 external/bsd/atf/dist/atf-sh/atf-sh-api.3                 |    2 +-
 external/bsd/atf/dist/atf-sh/atf_check_test.sh            |    2 +-
 external/bsd/atf/dist/atf-sh/config_test.sh               |    2 +-
 external/bsd/atf/dist/atf-sh/libatf-sh.subr               |  280 ++---------
 external/bsd/atf/dist/atf-sh/misc_helpers.sh              |    2 +-
 external/bsd/atf/dist/atf-sh/normalize_test.sh            |    2 +-
 external/bsd/atf/dist/atf-sh/tc_test.sh                   |    2 +-
 external/bsd/atf/dist/atf-sh/tp_test.sh                   |    2 +-
 external/bsd/atf/dist/atf-version/atf-version.1           |    2 +-
 external/bsd/atf/dist/atf-version/generate-revision.sh    |    2 +-
 external/bsd/atf/dist/doc/atf-formats.5                   |   36 +-
 external/bsd/atf/dist/doc/atf-test-program.1              |    2 +-
 external/bsd/atf/dist/doc/atf.7.in                        |    2 +-
 external/bsd/atf/dist/test-programs/c_helpers.c           |   16 +-
 external/bsd/atf/dist/test-programs/config_test.sh        |    2 +-
 external/bsd/atf/dist/test-programs/cpp_helpers.cpp       |    2 +-
 external/bsd/atf/dist/test-programs/expect_test.sh        |    2 +-
 external/bsd/atf/dist/test-programs/fork_test.sh          |    2 +-
 external/bsd/atf/dist/test-programs/meta_data_test.sh     |    2 +-
 external/bsd/atf/dist/test-programs/result_test.sh        |    2 +-
 external/bsd/atf/dist/test-programs/sh_helpers.sh         |    2 +-
 external/bsd/atf/dist/test-programs/srcdir_test.sh        |    2 +-
 141 files changed, 808 insertions(+), 692 deletions(-)

diffs (truncated from 4166 to 300 lines):

diff -r 2470807695f4 -r 6a1b4c95b7bf external/bsd/atf/dist/AUTHORS
--- a/external/bsd/atf/dist/AUTHORS     Mon Jan 16 22:20:45 2012 +0000
+++ b/external/bsd/atf/dist/AUTHORS     Mon Jan 16 22:36:30 2012 +0000
@@ -20,6 +20,11 @@
   initial version of the atf-check utility and started the addition of the
   ATF_REQUIRE family of macros in the C interface.
 
+* Paul Goyette <pgoyette%NetBSD.org@localhost>
+
+  Implemented timestamping of test programs and test cases so that
+  atf-report can provide timings for their execution.
+
 
 ===========================================================================
 vim: filetype=text:textwidth=75:expandtab:shiftwidth=2:softtabstop=2
diff -r 2470807695f4 -r 6a1b4c95b7bf external/bsd/atf/dist/COPYING
--- a/external/bsd/atf/dist/COPYING     Mon Jan 16 22:20:45 2012 +0000
+++ b/external/bsd/atf/dist/COPYING     Mon Jan 16 22:36:30 2012 +0000
@@ -5,7 +5,7 @@
 License
 *******
 
-Copyright (c) 2007, 2008, 2009, 2010, 2011 The NetBSD Foundation, Inc.
+Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012 The NetBSD Foundation, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -31,6 +31,36 @@
 POSSIBILITY OF SUCH DAMAGE.
 
 
+Copyright 2011, 2012 Google 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:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+* 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.
+
+* Neither the name of Google Inc. nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
+
+
 Relicensed code
 ***************
 
diff -r 2470807695f4 -r 6a1b4c95b7bf external/bsd/atf/dist/NEWS
--- a/external/bsd/atf/dist/NEWS        Mon Jan 16 22:20:45 2012 +0000
+++ b/external/bsd/atf/dist/NEWS        Mon Jan 16 22:36:30 2012 +0000
@@ -2,6 +2,43 @@
 ===========================================================================
 
 
+Changes in version 0.15
+***********************
+
+Experimental version released on January 16th, 2012.
+
+* Respect stdin in atf-check.  The previous release silenced stdin for any
+  processes spawned by atf, not only test programs, which caused breakage
+  in tests that pipe data through atf-check.
+
+* Performance improvements to atf-sh.
+
+* Enabled detection of unused parameters and variables in the code and
+  fixed all warnings.
+
+* Changed the behavior of "developer mode".  Compiler warnings are now
+  enabled unconditionally regardless of whether we are in developer mode or
+  not; developer mode is now only used to perform strict warning checks and
+  to enable assertions.  Additionally, developer mode is now only
+  automatically enabled when building from the repository, not for formal
+  releases.
+
+* Added new Autoconf M4 macros (ATF_ARG_WITH, ATF_CHECK_C and
+  ATF_CHECK_CXX) to provide a consistent way of defining a --with-arg flag
+  in configure scripts and detecting the presence of any of the ATF
+  bindings.  Note that ATF_CHECK_SH was already introduced in 0.14, but it
+  has now been modified to also honor --with-atf if instantiated.
+
+* Added timing support to atf-run / atf-report.
+
+* Added support for a 'require.memory' property, to specify the minimum
+  amount of physical memory needed by the test case to yield valid results.
+
+* PR bin/45690: Force an ISO-8859-1 encoding in the XML files generated by
+  atf-report so that invalid data in the output of test cases does not
+  mangle our report.
+
+
 Changes in version 0.14
 ***********************
 
diff -r 2470807695f4 -r 6a1b4c95b7bf external/bsd/atf/dist/atf-c++.hpp
--- a/external/bsd/atf/dist/atf-c++.hpp Mon Jan 16 22:20:45 2012 +0000
+++ b/external/bsd/atf/dist/atf-c++.hpp Mon Jan 16 22:36:30 2012 +0000
@@ -1,7 +1,7 @@
 //
 // Automated Testing Framework (atf)
 //
-// Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
+// Copyright (c) 2007 The NetBSD Foundation, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff -r 2470807695f4 -r 6a1b4c95b7bf external/bsd/atf/dist/atf-c++/atf-c++-api.3
--- a/external/bsd/atf/dist/atf-c++/atf-c++-api.3       Mon Jan 16 22:20:45 2012 +0000
+++ b/external/bsd/atf/dist/atf-c++/atf-c++-api.3       Mon Jan 16 22:36:30 2012 +0000
@@ -1,7 +1,7 @@
 .\"
 .\" Automated Testing Framework (atf)
 .\"
-.\" Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+.\" Copyright (c) 2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff -r 2470807695f4 -r 6a1b4c95b7bf external/bsd/atf/dist/atf-c++/check.cpp
--- a/external/bsd/atf/dist/atf-c++/check.cpp   Mon Jan 16 22:20:45 2012 +0000
+++ b/external/bsd/atf/dist/atf-c++/check.cpp   Mon Jan 16 22:36:30 2012 +0000
@@ -1,7 +1,7 @@
 //
 // Automated Testing Framework (atf)
 //
-// Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
+// Copyright (c) 2007 The NetBSD Foundation, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff -r 2470807695f4 -r 6a1b4c95b7bf external/bsd/atf/dist/atf-c++/check.hpp
--- a/external/bsd/atf/dist/atf-c++/check.hpp   Mon Jan 16 22:20:45 2012 +0000
+++ b/external/bsd/atf/dist/atf-c++/check.hpp   Mon Jan 16 22:36:30 2012 +0000
@@ -1,7 +1,7 @@
 //
 // Automated Testing Framework (atf)
 //
-// Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
+// Copyright (c) 2007 The NetBSD Foundation, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff -r 2470807695f4 -r 6a1b4c95b7bf external/bsd/atf/dist/atf-c++/check_test.cpp
--- a/external/bsd/atf/dist/atf-c++/check_test.cpp      Mon Jan 16 22:20:45 2012 +0000
+++ b/external/bsd/atf/dist/atf-c++/check_test.cpp      Mon Jan 16 22:36:30 2012 +0000
@@ -1,7 +1,7 @@
 //
 // Automated Testing Framework (atf)
 //
-// Copyright (c) 2007, 2008, 2009, 2010 The NetBSD Foundation, Inc.
+// Copyright (c) 2007 The NetBSD Foundation, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff -r 2470807695f4 -r 6a1b4c95b7bf external/bsd/atf/dist/atf-c++/config.cpp
--- a/external/bsd/atf/dist/atf-c++/config.cpp  Mon Jan 16 22:20:45 2012 +0000
+++ b/external/bsd/atf/dist/atf-c++/config.cpp  Mon Jan 16 22:36:30 2012 +0000
@@ -1,7 +1,7 @@
 //
 // Automated Testing Framework (atf)
 //
-// Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
+// Copyright (c) 2007 The NetBSD Foundation, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff -r 2470807695f4 -r 6a1b4c95b7bf external/bsd/atf/dist/atf-c++/config.hpp
--- a/external/bsd/atf/dist/atf-c++/config.hpp  Mon Jan 16 22:20:45 2012 +0000
+++ b/external/bsd/atf/dist/atf-c++/config.hpp  Mon Jan 16 22:36:30 2012 +0000
@@ -1,7 +1,7 @@
 //
 // Automated Testing Framework (atf)
 //
-// Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
+// Copyright (c) 2007 The NetBSD Foundation, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff -r 2470807695f4 -r 6a1b4c95b7bf external/bsd/atf/dist/atf-c++/config_test.cpp
--- a/external/bsd/atf/dist/atf-c++/config_test.cpp     Mon Jan 16 22:20:45 2012 +0000
+++ b/external/bsd/atf/dist/atf-c++/config_test.cpp     Mon Jan 16 22:36:30 2012 +0000
@@ -1,7 +1,7 @@
 //
 // Automated Testing Framework (atf)
 //
-// Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
+// Copyright (c) 2007 The NetBSD Foundation, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff -r 2470807695f4 -r 6a1b4c95b7bf external/bsd/atf/dist/atf-c++/detail/application.cpp
--- a/external/bsd/atf/dist/atf-c++/detail/application.cpp      Mon Jan 16 22:20:45 2012 +0000
+++ b/external/bsd/atf/dist/atf-c++/detail/application.cpp      Mon Jan 16 22:36:30 2012 +0000
@@ -1,7 +1,7 @@
 //
 // Automated Testing Framework (atf)
 //
-// Copyright (c) 2007, 2008, 2010, 2011 The NetBSD Foundation, Inc.
+// Copyright (c) 2007 The NetBSD Foundation, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -41,6 +41,10 @@
 #include <cstring>
 #include <iostream>
 
+extern "C" {
+#include "atf-c/defs.h"
+}
+
 #include "application.hpp"
 #include "sanity.hpp"
 #include "ui.hpp"
@@ -151,7 +155,8 @@
 }
 
 void
-impl::app::process_option(int ch, const char* arg)
+impl::app::process_option(int ch ATF_DEFS_ATTRIBUTE_UNUSED,
+                          const char* arg ATF_DEFS_ATTRIBUTE_UNUSED)
 {
 }
 
diff -r 2470807695f4 -r 6a1b4c95b7bf external/bsd/atf/dist/atf-c++/detail/application.hpp
--- a/external/bsd/atf/dist/atf-c++/detail/application.hpp      Mon Jan 16 22:20:45 2012 +0000
+++ b/external/bsd/atf/dist/atf-c++/detail/application.hpp      Mon Jan 16 22:36:30 2012 +0000
@@ -1,7 +1,7 @@
 //
 // Automated Testing Framework (atf)
 //
-// Copyright (c) 2007, 2008, 2010 The NetBSD Foundation, Inc.
+// Copyright (c) 2007 The NetBSD Foundation, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff -r 2470807695f4 -r 6a1b4c95b7bf external/bsd/atf/dist/atf-c++/detail/application_test.cpp
--- a/external/bsd/atf/dist/atf-c++/detail/application_test.cpp Mon Jan 16 22:20:45 2012 +0000
+++ b/external/bsd/atf/dist/atf-c++/detail/application_test.cpp Mon Jan 16 22:36:30 2012 +0000
@@ -71,6 +71,7 @@
             }
         }
 
+        ATF_REQUIRE(zflag);
         ATF_REQUIRE_EQ(1, argc - optind);
         ATF_REQUIRE_EQ(std::string("foo"), argv[optind]);
 
diff -r 2470807695f4 -r 6a1b4c95b7bf external/bsd/atf/dist/atf-c++/detail/env.cpp
--- a/external/bsd/atf/dist/atf-c++/detail/env.cpp      Mon Jan 16 22:20:45 2012 +0000
+++ b/external/bsd/atf/dist/atf-c++/detail/env.cpp      Mon Jan 16 22:36:30 2012 +0000
@@ -1,7 +1,7 @@
 //
 // Automated Testing Framework (atf)
 //
-// Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
+// Copyright (c) 2007 The NetBSD Foundation, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff -r 2470807695f4 -r 6a1b4c95b7bf external/bsd/atf/dist/atf-c++/detail/env.hpp
--- a/external/bsd/atf/dist/atf-c++/detail/env.hpp      Mon Jan 16 22:20:45 2012 +0000
+++ b/external/bsd/atf/dist/atf-c++/detail/env.hpp      Mon Jan 16 22:36:30 2012 +0000
@@ -1,7 +1,7 @@
 //
 // Automated Testing Framework (atf)
 //
-// Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
+// Copyright (c) 2007 The NetBSD Foundation, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff -r 2470807695f4 -r 6a1b4c95b7bf external/bsd/atf/dist/atf-c++/detail/env_test.cpp
--- a/external/bsd/atf/dist/atf-c++/detail/env_test.cpp Mon Jan 16 22:20:45 2012 +0000
+++ b/external/bsd/atf/dist/atf-c++/detail/env_test.cpp Mon Jan 16 22:36:30 2012 +0000
@@ -1,7 +1,7 @@
 //
 // Automated Testing Framework (atf)
 //
-// Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
+// Copyright (c) 2007 The NetBSD Foundation, Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff -r 2470807695f4 -r 6a1b4c95b7bf external/bsd/atf/dist/atf-c++/detail/exceptions.cpp



Home | Main Index | Thread Index | Old Index