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.19:



details:   https://anonhg.NetBSD.org/src/rev/b65f1094c125
branches:  trunk
changeset: 326632:b65f1094c125
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Sat Feb 08 19:11:29 2014 +0000

description:
Import atf 0.19:

Changes in version 0.19
***********************

Experimental version released on February 7th, 2014.

This is the last release to bundle the code for the deprecated tools.
The next release will drop their code and will stop worrying about
backwards compatibility between the ATF libraries and what the old tools
may or may not support.

If you still require the old tools for some reason, grab a copy of the
'tools' directory now.  The code in this directory is standalone and
does not depend on any internal details of atf-c++ any longer.

* Various fixes and improvements to support running as part of the FreeBSD
  test suite.

* Project hosting moved from Google Code (as a subproject of Kyua) to
  GitHub (as a first-class project).  The main reason for the change is
  the suppression of binary downloads in Google Code on Jan 15th, 2014.
  See https://github.com/jmmv/atf/

* Removed builtin help from atf-sh(1) and atf-check(1) for simplicity
  reasons.  In other words, their -h option is gone.

* Moved the code of the deprecated tools into a 'tools' directory and
  completely decoupled their code from the internals of atf-c++.  The
  reason for this is to painlessly allow a third-party to maintain a
  copy of these tools after we delete them because upcoming changes to
  atf-c++ would break the stale tools.


Changes in version 0.18
***********************

Experimental version released on November 16th, 2013.

* Issue 45: Added require.memory support in atf-run for FreeBSD.

* Fixed an issue with the handling of cin with libc++.

* Issue 64: Fixed various mandoc formatting warnings.

* NetBSD PR bin/48284: Made atf-check flush its progress message to
  stdout so that an interrupted test case always shows the last message
  being executed.

* NetBSD PR bin/48285: Fixed atf_check examples in atf-sh-api(3).

diffstat:

 external/bsd/atf/dist/Atffile                             |     4 +-
 external/bsd/atf/dist/Kyuafile                            |    10 +-
 external/bsd/atf/dist/NEWS                                |    50 +
 external/bsd/atf/dist/atf-c++/atf-c++-api.3               |    37 +-
 external/bsd/atf/dist/atf-c++/check.hpp                   |     8 +-
 external/bsd/atf/dist/atf-c++/check_test.cpp              |     4 +-
 external/bsd/atf/dist/atf-c++/config.cpp                  |     4 -
 external/bsd/atf/dist/atf-c++/config_test.cpp             |     4 -
 external/bsd/atf/dist/atf-c++/detail/Atffile              |     3 -
 external/bsd/atf/dist/atf-c++/detail/Kyuafile             |     4 +-
 external/bsd/atf/dist/atf-c++/detail/application.cpp      |   115 +-
 external/bsd/atf/dist/atf-c++/detail/application.hpp      |     8 +-
 external/bsd/atf/dist/atf-c++/detail/application_test.cpp |     2 +-
 external/bsd/atf/dist/atf-c++/detail/exceptions.hpp       |    41 -
 external/bsd/atf/dist/atf-c++/detail/process_test.cpp     |     4 +-
 external/bsd/atf/dist/atf-c++/detail/test_helpers.cpp     |    82 +-
 external/bsd/atf/dist/atf-c++/detail/test_helpers.hpp     |    63 +-
 external/bsd/atf/dist/atf-c++/detail/version_helper.cpp   |    41 +
 external/bsd/atf/dist/atf-c++/macros_test.cpp             |    29 +-
 external/bsd/atf/dist/atf-c++/tests_test.cpp              |     2 +-
 external/bsd/atf/dist/atf-c/config.c                      |     4 -
 external/bsd/atf/dist/atf-c/config_test.c                 |     4 -
 external/bsd/atf/dist/atf-c/detail/test_helpers.h         |    17 +-
 external/bsd/atf/dist/atf-c/detail/version_helper.c       |    43 +
 external/bsd/atf/dist/atf-sh/atf-sh-api.3                 |    13 +-
 external/bsd/atf/dist/atf-sh/atf-sh.1                     |     5 +-
 external/bsd/atf/dist/atf-sh/atf-sh.cpp                   |     2 +-
 external/bsd/atf/dist/atf-sh/atf_check_test.sh            |    16 +
 external/bsd/atf/dist/atf-sh/integration_test.sh          |     2 +-
 external/bsd/atf/dist/atf-sh/misc_helpers.sh              |    13 +
 external/bsd/atf/dist/tools/Atffile                       |    25 +
 external/bsd/atf/dist/tools/Kyuafile                      |    24 +
 external/bsd/atf/dist/tools/application.cpp               |   317 +++
 external/bsd/atf/dist/tools/application.hpp               |   113 +
 external/bsd/atf/dist/tools/application_test.cpp          |    94 +
 external/bsd/atf/dist/tools/atf-config_test.sh            |   180 ++
 external/bsd/atf/dist/tools/atf-formats.5                 |   231 ++
 external/bsd/atf/dist/tools/atf-report_test.sh            |   449 +++++
 external/bsd/atf/dist/tools/atf-run_test.sh               |  1134 +++++++++++++
 external/bsd/atf/dist/tools/atf.7.in                      |   192 ++
 external/bsd/atf/dist/tools/atffile.cpp                   |   348 +++
 external/bsd/atf/dist/tools/atffile.hpp                   |    92 +
 external/bsd/atf/dist/tools/atffile_test.cpp              |   636 +++++++
 external/bsd/atf/dist/tools/auto_array.hpp                |   179 ++
 external/bsd/atf/dist/tools/auto_array_test.cpp           |   303 +++
 external/bsd/atf/dist/tools/bad_metadata_helper.c         |    38 +
 external/bsd/atf/dist/tools/config.cpp                    |   135 +
 external/bsd/atf/dist/tools/config.hpp                    |    75 +
 external/bsd/atf/dist/tools/config_file.cpp               |   223 ++
 external/bsd/atf/dist/tools/config_file.hpp               |    66 +
 external/bsd/atf/dist/tools/config_file_test.cpp          |   395 ++++
 external/bsd/atf/dist/tools/config_test.cpp               |   221 ++
 external/bsd/atf/dist/tools/defs.hpp.in                   |    37 +
 external/bsd/atf/dist/tools/env.cpp                       |   102 +
 external/bsd/atf/dist/tools/env.hpp                       |    84 +
 external/bsd/atf/dist/tools/env_test.cpp                  |    91 +
 external/bsd/atf/dist/tools/exceptions.cpp                |    74 +
 external/bsd/atf/dist/tools/exceptions.hpp                |    93 +
 external/bsd/atf/dist/tools/expand.cpp                    |    81 +
 external/bsd/atf/dist/tools/expand.hpp                    |    82 +
 external/bsd/atf/dist/tools/expand_test.cpp               |   272 +++
 external/bsd/atf/dist/tools/expect_helpers.c              |   193 ++
 external/bsd/atf/dist/tools/fail_helper.cpp               |    45 +
 external/bsd/atf/dist/tools/fs.cpp                        |   744 ++++++++
 external/bsd/atf/dist/tools/fs.hpp                        |   377 ++++
 external/bsd/atf/dist/tools/fs_test.cpp                   |   743 ++++++++
 external/bsd/atf/dist/tools/io.cpp                        |   356 ++++
 external/bsd/atf/dist/tools/io.hpp                        |   436 ++++
 external/bsd/atf/dist/tools/io_test.cpp                   |   471 +++++
 external/bsd/atf/dist/tools/misc_helpers.cpp              |   448 +++++
 external/bsd/atf/dist/tools/parser.cpp                    |   384 ++++
 external/bsd/atf/dist/tools/parser.hpp                    |   607 ++++++
 external/bsd/atf/dist/tools/parser_test.cpp               |  1043 +++++++++++
 external/bsd/atf/dist/tools/pass_helper.cpp               |    44 +
 external/bsd/atf/dist/tools/process.cpp                   |   492 +++++
 external/bsd/atf/dist/tools/process.hpp                   |   324 +++
 external/bsd/atf/dist/tools/process_helpers.c             |   117 +
 external/bsd/atf/dist/tools/process_test.cpp              |   360 ++++
 external/bsd/atf/dist/tools/reader.cpp                    |   440 +++++
 external/bsd/atf/dist/tools/reader.hpp                    |    89 +
 external/bsd/atf/dist/tools/reader_test.cpp               |   987 +++++++++++
 external/bsd/atf/dist/tools/requirements.cpp              |   325 +++
 external/bsd/atf/dist/tools/requirements.hpp              |    47 +
 external/bsd/atf/dist/tools/requirements_test.cpp         |   400 ++++
 external/bsd/atf/dist/tools/sample/atf-run.hooks          |    23 +
 external/bsd/atf/dist/tools/sample/common.conf            |    11 +
 external/bsd/atf/dist/tools/several_tcs_helper.c          |    67 +
 external/bsd/atf/dist/tools/share/atf-run.hooks           |    94 +
 external/bsd/atf/dist/tools/signals.cpp                   |   146 +
 external/bsd/atf/dist/tools/signals.hpp                   |    92 +
 external/bsd/atf/dist/tools/signals_test.cpp              |   275 +++
 external/bsd/atf/dist/tools/test-program.cpp              |   790 +++++++++
 external/bsd/atf/dist/tools/test-program.hpp              |   157 +
 external/bsd/atf/dist/tools/test_helpers.hpp              |   116 +
 external/bsd/atf/dist/tools/test_program_test.cpp         |  1023 +++++++++++
 external/bsd/atf/dist/tools/tests-results.css             |   199 ++
 external/bsd/atf/dist/tools/tests-results.dtd             |    61 +
 external/bsd/atf/dist/tools/tests-results.xsl             |   564 ++++++
 external/bsd/atf/dist/tools/text.cpp                      |   158 +
 external/bsd/atf/dist/tools/text.hpp                      |   153 +
 external/bsd/atf/dist/tools/text_test.cpp                 |   390 ++++
 external/bsd/atf/dist/tools/timers.cpp                    |   211 ++
 external/bsd/atf/dist/tools/timers.hpp                    |    83 +
 external/bsd/atf/dist/tools/ui.cpp                        |   172 +
 external/bsd/atf/dist/tools/ui.hpp                        |   105 +
 external/bsd/atf/dist/tools/ui_test.cpp                   |   462 +++++
 external/bsd/atf/dist/tools/user.cpp                      |   102 +
 external/bsd/atf/dist/tools/user.hpp                      |    52 +
 external/bsd/atf/dist/tools/user_test.cpp                 |   148 +
 external/bsd/atf/dist/tools/zero_tcs_helper.c             |    36 +
 110 files changed, 21830 insertions(+), 352 deletions(-)

diffs (truncated from 23061 to 300 lines):

diff -r fca6feeb3811 -r b65f1094c125 external/bsd/atf/dist/Atffile
--- a/external/bsd/atf/dist/Atffile     Sat Feb 08 19:06:05 2014 +0000
+++ b/external/bsd/atf/dist/Atffile     Sat Feb 08 19:11:29 2014 +0000
@@ -7,6 +7,4 @@
 tp: atf-sh
 tp: test-programs
 
-tp-glob: atf-config*
-tp-glob: atf-report*
-tp-glob: atf-run*
+tp-glob: tools*
diff -r fca6feeb3811 -r b65f1094c125 external/bsd/atf/dist/Kyuafile
--- a/external/bsd/atf/dist/Kyuafile    Sat Feb 08 19:06:05 2014 +0000
+++ b/external/bsd/atf/dist/Kyuafile    Sat Feb 08 19:11:29 2014 +0000
@@ -7,12 +7,6 @@
 include("atf-sh/Kyuafile")
 include("test-programs/Kyuafile")
 
-if fs.exists("atf-config/Kyuafile") then
-   include("atf-config/Kyuafile")
+if fs.exists("tools/Kyuafile") then
+   include("tools/Kyuafile")
 end
-if fs.exists("atf-report/Kyuafile") then
-   include("atf-report/Kyuafile")
-end
-if fs.exists("atf-run/Kyuafile") then
-   include("atf-run/Kyuafile")
-end
diff -r fca6feeb3811 -r b65f1094c125 external/bsd/atf/dist/NEWS
--- a/external/bsd/atf/dist/NEWS        Sat Feb 08 19:06:05 2014 +0000
+++ b/external/bsd/atf/dist/NEWS        Sat Feb 08 19:11:29 2014 +0000
@@ -2,6 +2,56 @@
 ===========================================================================
 
 
+Changes in version 0.19
+***********************
+
+Experimental version released on February 7th, 2014.
+
+This is the last release to bundle the code for the deprecated tools.
+The next release will drop their code and will stop worrying about
+backwards compatibility between the ATF libraries and what the old tools
+may or may not support.
+
+If you still require the old tools for some reason, grab a copy of the
+'tools' directory now.  The code in this directory is standalone and
+does not depend on any internal details of atf-c++ any longer.
+
+* Various fixes and improvements to support running as part of the FreeBSD
+  test suite.
+
+* Project hosting moved from Google Code (as a subproject of Kyua) to
+  GitHub (as a first-class project).  The main reason for the change is
+  the suppression of binary downloads in Google Code on Jan 15th, 2014.
+  See https://github.com/jmmv/atf/
+
+* Removed builtin help from atf-sh(1) and atf-check(1) for simplicity
+  reasons.  In other words, their -h option is gone.
+
+* Moved the code of the deprecated tools into a 'tools' directory and
+  completely decoupled their code from the internals of atf-c++.  The
+  reason for this is to painlessly allow a third-party to maintain a
+  copy of these tools after we delete them because upcoming changes to
+  atf-c++ would break the stale tools.
+
+
+Changes in version 0.18
+***********************
+
+Experimental version released on November 16th, 2013.
+
+* Issue 45: Added require.memory support in atf-run for FreeBSD.
+
+* Fixed an issue with the handling of cin with libc++.
+
+* Issue 64: Fixed various mandoc formatting warnings.
+
+* NetBSD PR bin/48284: Made atf-check flush its progress message to
+  stdout so that an interrupted test case always shows the last message
+  being executed.
+
+* NetBSD PR bin/48285: Fixed atf_check examples in atf-sh-api(3).
+
+
 Changes in version 0.17
 ***********************
 
diff -r fca6feeb3811 -r b65f1094c125 external/bsd/atf/dist/atf-c++/atf-c++-api.3
--- a/external/bsd/atf/dist/atf-c++/atf-c++-api.3       Sat Feb 08 19:06:05 2014 +0000
+++ b/external/bsd/atf/dist/atf-c++/atf-c++-api.3       Sat Feb 08 19:11:29 2014 +0000
@@ -26,7 +26,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 30, 2012
+.Dd November 15, 2013
 .Dt ATF-C++-API 3
 .Os
 .Sh NAME
@@ -145,17 +145,8 @@
 .Fa "const std::string& expected_stderr"
 .Fc
 .Sh DESCRIPTION
-ATF provides a mostly-macro-based programming interface to implement test
-programs in C or C++.
-This interface is backed by a C++ implementation, but this fact is
-hidden from the developer as much as possible through the use of
-macros to simplify programming.
-However, the use of C++ is not hidden everywhere and while you can
-implement test cases without knowing anything at all about the object model
-underneath the provided calls, you might need some minimum notions of the
-language in very specific circumstances.
-.Pp
-C++-based test programs always follow this template:
+ATF provides a C++ programming interface to implement test programs.
+C++-based test programs follow this template:
 .Bd -literal -offset indent
 extern "C" {
 .Ns ... C-specific includes go here ...
@@ -440,7 +431,7 @@
 .Fa "const std::string& path"
 .Fa "const std::string& prefix"
 .Fc
-.Bd -offset indent
+.Bd -ragged -offset indent
 Prints the contents of
 .Fa path
 to the standard output, prefixing every line with the string in
@@ -452,7 +443,7 @@
 .Fa "const std::string& path"
 .Fa "const std::string& contents"
 .Fc
-.Bd -offset indent
+.Bd -ragged -offset indent
 Returns true if the given
 .Fa path
 matches exactly the expected inlined
@@ -464,7 +455,7 @@
 .Fa "const std::string& source"
 .Fa "const std::string& destination"
 .Fc
-.Bd -offset indent
+.Bd -ragged -offset indent
 Copies the file
 .Fa source
 to
@@ -477,7 +468,7 @@
 .Fa "const std::string& path"
 .Fa "const std::string& contents"
 .Fc
-.Bd -offset indent
+.Bd -ragged -offset indent
 Creates
 .Fa file
 with the text given in
@@ -488,7 +479,7 @@
 .Fo atf::utils::file_exists
 .Fa "const std::string& path"
 .Fc
-.Bd -offset indent
+.Bd -ragged -offset indent
 Checks if
 .Fa path
 exists.
@@ -498,7 +489,7 @@
 .Fo atf::utils::fork
 .Fa "void"
 .Fc
-.Bd -offset indent
+.Bd -ragged -offset indent
 Forks a process and redirects the standard output and standard error of the
 child to files for later validation with
 .Fn atf::utils::wait .
@@ -510,7 +501,7 @@
 .Fa "const std::string& regexp"
 .Fa "const Collection& collection"
 .Fc
-.Bd -offset indent
+.Bd -ragged -offset indent
 Searches for the regular expression
 .Fa regexp
 in any of the strings contained in the
@@ -523,7 +514,7 @@
 .Fa "const std::string& regexp"
 .Fa "const std::string& path"
 .Fc
-.Bd -offset indent
+.Bd -ragged -offset indent
 Searches for the regular expression
 .Fa regexp
 in the file
@@ -536,7 +527,7 @@
 .Fa "const std::string& regexp"
 .Fa "const std::string& str"
 .Fc
-.Bd -offset indent
+.Bd -ragged -offset indent
 Searches for the regular expression
 .Fa regexp
 in the string
@@ -547,7 +538,7 @@
 .Fa "const int fd"
 .Fa "const std::string& path"
 .Fc
-.Bd -offset indent
+.Bd -ragged -offset indent
 Redirects the given file descriptor
 .Fa fd
 to the file
@@ -566,7 +557,7 @@
 .Fa "const std::string& expected_stdout"
 .Fa "const std::string& expected_stderr"
 .Fc
-.Bd -offset indent
+.Bd -ragged -offset indent
 Waits and validates the result of a subprocess spawned with
 .Fn atf::utils::wait .
 The validation involves checking that the subprocess exited cleanly and returned
diff -r fca6feeb3811 -r b65f1094c125 external/bsd/atf/dist/atf-c++/check.hpp
--- a/external/bsd/atf/dist/atf-c++/check.hpp   Sat Feb 08 19:06:05 2014 +0000
+++ b/external/bsd/atf/dist/atf-c++/check.hpp   Sat Feb 08 19:11:29 2014 +0000
@@ -39,8 +39,6 @@
 #include <string>
 #include <vector>
 
-#include <atf-c++/noncopyable.hpp>
-
 namespace atf {
 
 namespace process {
@@ -60,7 +58,11 @@
 //! of executing arbitrary command and manages files containing
 //! its output.
 //!
-class check_result : noncopyable {
+class check_result {
+    // Non-copyable.
+    check_result(const check_result&);
+    check_result& operator=(const check_result&);
+
     //!
     //! \brief Internal representation of a result.
     //!
diff -r fca6feeb3811 -r b65f1094c125 external/bsd/atf/dist/atf-c++/check_test.cpp
--- a/external/bsd/atf/dist/atf-c++/check_test.cpp      Sat Feb 08 19:06:05 2014 +0000
+++ b/external/bsd/atf/dist/atf-c++/check_test.cpp      Sat Feb 08 19:11:29 2014 +0000
@@ -61,7 +61,7 @@
 do_exec(const atf::tests::tc* tc, const char* helper_name)
 {
     std::vector< std::string > argv;
-    argv.push_back(get_process_helpers_path(*tc).str());
+    argv.push_back(get_process_helpers_path(*tc, false).str());
     argv.push_back(helper_name);
     std::cout << "Executing " << argv[0] << " " << argv[1] << "\n";
 
@@ -74,7 +74,7 @@
 do_exec(const atf::tests::tc* tc, const char* helper_name, const char *carg2)
 {
     std::vector< std::string > argv;
-    argv.push_back(get_process_helpers_path(*tc).str());
+    argv.push_back(get_process_helpers_path(*tc, false).str());
     argv.push_back(helper_name);
     argv.push_back(carg2);
     std::cout << "Executing " << argv[0] << " " << argv[1] << " "
diff -r fca6feeb3811 -r b65f1094c125 external/bsd/atf/dist/atf-c++/config.cpp
--- a/external/bsd/atf/dist/atf-c++/config.cpp  Sat Feb 08 19:06:05 2014 +0000
+++ b/external/bsd/atf/dist/atf-c++/config.cpp  Sat Feb 08 19:11:29 2014 +0000
@@ -52,18 +52,14 @@
 {
     PRE(m_variables.empty());
 
-    m_variables["atf_arch"] = atf_config_get("atf_arch");
     m_variables["atf_build_cc"] = atf_config_get("atf_build_cc");
     m_variables["atf_build_cflags"] = atf_config_get("atf_build_cflags");
     m_variables["atf_build_cpp"] = atf_config_get("atf_build_cpp");
     m_variables["atf_build_cppflags"] = atf_config_get("atf_build_cppflags");
     m_variables["atf_build_cxx"] = atf_config_get("atf_build_cxx");
     m_variables["atf_build_cxxflags"] = atf_config_get("atf_build_cxxflags");
-    m_variables["atf_confdir"] = atf_config_get("atf_confdir");
     m_variables["atf_includedir"] = atf_config_get("atf_includedir");
-    m_variables["atf_libdir"] = atf_config_get("atf_libdir");
     m_variables["atf_libexecdir"] = atf_config_get("atf_libexecdir");
-    m_variables["atf_machine"] = atf_config_get("atf_machine");
     m_variables["atf_pkgdatadir"] = atf_config_get("atf_pkgdatadir");
     m_variables["atf_shell"] = atf_config_get("atf_shell");
     m_variables["atf_workdir"] = atf_config_get("atf_workdir");
diff -r fca6feeb3811 -r b65f1094c125 external/bsd/atf/dist/atf-c++/config_test.cpp
--- a/external/bsd/atf/dist/atf-c++/config_test.cpp     Sat Feb 08 19:06:05 2014 +0000
+++ b/external/bsd/atf/dist/atf-c++/config_test.cpp     Sat Feb 08 19:11:29 2014 +0000
@@ -44,18 +44,14 @@
     const char *uc;
     bool can_be_empty;
 } all_vars[] = {
-    { "atf_arch",           "ATF_ARCH",           false },
     { "atf_build_cc",       "ATF_BUILD_CC",       false },
     { "atf_build_cflags",   "ATF_BUILD_CFLAGS",   true  },
     { "atf_build_cpp",      "ATF_BUILD_CPP",      false },
     { "atf_build_cppflags", "ATF_BUILD_CPPFLAGS", true  },



Home | Main Index | Thread Index | Old Index