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



details:   https://anonhg.NetBSD.org/src/rev/cf2817bd2e08
branches:  trunk
changeset: 758117:cf2817bd2e08
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Wed Oct 20 09:14:17 2010 +0000

description:
Import atf-0.11:

Experimental version released on October 20th, 2010.

* The ATF_CHECK* macros in atf-c++ were renamed to ATF_REQUIRE* to match
  their counterparts in atf-c.

* Clearly separated the modules in atf-c that are supposed to be public
  from those that are implementation details.  The header files for the
  internal modules are not installed any more.

* Made the atf-check tool private.  It is only required by atf-sh and being
  public has the danger of causing confusion.  Also, making it private
  simplifies the public API of atf.

* Changed atf-sh to enable per-command error checking (set -e) by default.
  This catches many cases in which a test case is broken but it is not
  reported as such because execution continues.

* Fixed the XSTL and CSS stylesheets to support expected failures.

diffstat:

 external/bsd/atf/dist/Atffile                             |     1 -
 external/bsd/atf/dist/COPYING                             |     4 +-
 external/bsd/atf/dist/NEWS                                |    23 +
 external/bsd/atf/dist/atf-c++/Atffile                     |    21 +-
 external/bsd/atf/dist/atf-c++/atf-c++-api.3               |    36 +-
 external/bsd/atf/dist/atf-c++/atf_c++_test.cpp            |     4 +-
 external/bsd/atf/dist/atf-c++/build.cpp                   |    36 +-
 external/bsd/atf/dist/atf-c++/build_test.cpp              |    22 +-
 external/bsd/atf/dist/atf-c++/check.cpp                   |    36 +-
 external/bsd/atf/dist/atf-c++/check.hpp                   |    28 +-
 external/bsd/atf/dist/atf-c++/check_test.cpp              |   186 +-
 external/bsd/atf/dist/atf-c++/config.cpp                  |     9 +-
 external/bsd/atf/dist/atf-c++/config_test.cpp             |    49 +-
 external/bsd/atf/dist/atf-c++/detail/Atffile              |    13 +
 external/bsd/atf/dist/atf-c++/detail/application.cpp      |   338 +++
 external/bsd/atf/dist/atf-c++/detail/application.hpp      |   115 +
 external/bsd/atf/dist/atf-c++/detail/application_test.cpp |    93 +
 external/bsd/atf/dist/atf-c++/detail/env.cpp              |    73 +
 external/bsd/atf/dist/atf-c++/detail/env.hpp              |    84 +
 external/bsd/atf/dist/atf-c++/detail/env_test.cpp         |    91 +
 external/bsd/atf/dist/atf-c++/detail/exceptions.cpp       |   156 +
 external/bsd/atf/dist/atf-c++/detail/exceptions.hpp       |    98 +
 external/bsd/atf/dist/atf-c++/detail/exceptions_test.cpp  |   147 +
 external/bsd/atf/dist/atf-c++/detail/expand.cpp           |    81 +
 external/bsd/atf/dist/atf-c++/detail/expand.hpp           |    82 +
 external/bsd/atf/dist/atf-c++/detail/expand_test.cpp      |   272 +++
 external/bsd/atf/dist/atf-c++/detail/fs.cpp               |   517 +++++
 external/bsd/atf/dist/atf-c++/detail/fs.hpp               |   391 ++++
 external/bsd/atf/dist/atf-c++/detail/fs_test.cpp          |   554 ++++++
 external/bsd/atf/dist/atf-c++/detail/parser.cpp           |   384 ++++
 external/bsd/atf/dist/atf-c++/detail/parser.hpp           |   607 ++++++
 external/bsd/atf/dist/atf-c++/detail/parser_test.cpp      |  1043 +++++++++++
 external/bsd/atf/dist/atf-c++/detail/process.cpp          |   355 ++++
 external/bsd/atf/dist/atf-c++/detail/process.hpp          |   270 +++
 external/bsd/atf/dist/atf-c++/detail/process_test.cpp     |   357 ++++
 external/bsd/atf/dist/atf-c++/detail/sanity.hpp           |    37 +
 external/bsd/atf/dist/atf-c++/detail/sanity_test.cpp      |    41 +
 external/bsd/atf/dist/atf-c++/detail/test_helpers.cpp     |   156 +
 external/bsd/atf/dist/atf-c++/detail/test_helpers.hpp     |   157 +
 external/bsd/atf/dist/atf-c++/detail/text.cpp             |   135 +
 external/bsd/atf/dist/atf-c++/detail/text.hpp             |   144 +
 external/bsd/atf/dist/atf-c++/detail/text_test.cpp        |   365 ++++
 external/bsd/atf/dist/atf-c++/detail/ui.cpp               |   172 +
 external/bsd/atf/dist/atf-c++/detail/ui.hpp               |   105 +
 external/bsd/atf/dist/atf-c++/detail/ui_test.cpp          |   462 +++++
 external/bsd/atf/dist/atf-c++/macros.hpp                  |     8 +-
 external/bsd/atf/dist/atf-c++/macros_hpp_test.cpp         |    96 +-
 external/bsd/atf/dist/atf-c++/macros_test.cpp             |   154 +-
 external/bsd/atf/dist/atf-c++/pkg_config_test.sh          |     3 +-
 external/bsd/atf/dist/atf-c++/tests_test.cpp              |    58 +-
 external/bsd/atf/dist/atf-c++/utils_test.cpp              |    78 +-
 external/bsd/atf/dist/atf-c/Atffile                       |    12 +-
 external/bsd/atf/dist/atf-c/atf_c_test.c                  |     2 +-
 external/bsd/atf/dist/atf-c/build.c                       |   148 +-
 external/bsd/atf/dist/atf-c/build.h                       |    11 +-
 external/bsd/atf/dist/atf-c/build_test.c                  |   126 +-
 external/bsd/atf/dist/atf-c/check.c                       |   183 +-
 external/bsd/atf/dist/atf-c/check.h                       |    18 +-
 external/bsd/atf/dist/atf-c/check_test.c                  |   138 +-
 external/bsd/atf/dist/atf-c/config.c                      |     7 +-
 external/bsd/atf/dist/atf-c/config_test.c                 |     6 +-
 external/bsd/atf/dist/atf-c/detail/Atffile                |    14 +
 external/bsd/atf/dist/atf-c/detail/dynstr.c               |   398 ++++
 external/bsd/atf/dist/atf-c/detail/dynstr.h               |    81 +
 external/bsd/atf/dist/atf-c/detail/dynstr_test.c          |   637 +++++++
 external/bsd/atf/dist/atf-c/detail/env.c                  |   108 +
 external/bsd/atf/dist/atf-c/detail/env.h                  |    42 +
 external/bsd/atf/dist/atf-c/detail/env_test.c             |   116 +
 external/bsd/atf/dist/atf-c/detail/fs.c                   |   887 ++++++++++
 external/bsd/atf/dist/atf-c/detail/fs.h                   |   133 +
 external/bsd/atf/dist/atf-c/detail/fs_test.c              |  1096 ++++++++++++
 external/bsd/atf/dist/atf-c/detail/list.c                 |   392 ++++
 external/bsd/atf/dist/atf-c/detail/list.h                 |   115 +
 external/bsd/atf/dist/atf-c/detail/list_test.c            |   369 ++++
 external/bsd/atf/dist/atf-c/detail/map.c                  |   383 ++++
 external/bsd/atf/dist/atf-c/detail/map.h                  |   119 +
 external/bsd/atf/dist/atf-c/detail/map_test.c             |   425 ++++
 external/bsd/atf/dist/atf-c/detail/process.c              |   668 +++++++
 external/bsd/atf/dist/atf-c/detail/process.h              |   134 +
 external/bsd/atf/dist/atf-c/detail/process_helpers.c      |   117 +
 external/bsd/atf/dist/atf-c/detail/process_test.c         |  1150 +++++++++++++
 external/bsd/atf/dist/atf-c/detail/sanity.c               |    78 +
 external/bsd/atf/dist/atf-c/detail/sanity.h               |    73 +
 external/bsd/atf/dist/atf-c/detail/sanity_test.c          |   253 ++
 external/bsd/atf/dist/atf-c/detail/test_helpers.c         |   214 ++
 external/bsd/atf/dist/atf-c/detail/test_helpers.h         |    78 +
 external/bsd/atf/dist/atf-c/detail/test_helpers_test.c    |   187 ++
 external/bsd/atf/dist/atf-c/detail/text.c                 |   184 ++
 external/bsd/atf/dist/atf-c/detail/text.h                 |    49 +
 external/bsd/atf/dist/atf-c/detail/text_test.c            |   424 ++++
 external/bsd/atf/dist/atf-c/detail/tp_main.c              |   598 ++++++
 external/bsd/atf/dist/atf-c/detail/user.c                 |    78 +
 external/bsd/atf/dist/atf-c/detail/user.h                 |    49 +
 external/bsd/atf/dist/atf-c/detail/user_test.c            |   141 +
 external/bsd/atf/dist/atf-c/error.c                       |     3 +-
 external/bsd/atf/dist/atf-c/error_test.c                  |     2 +-
 external/bsd/atf/dist/atf-c/macros.h                      |     7 +-
 external/bsd/atf/dist/atf-c/macros_test.c                 |    15 +-
 external/bsd/atf/dist/atf-c/tc.h                          |    26 +-
 external/bsd/atf/dist/atf-c/tc_test.c                     |    11 +-
 external/bsd/atf/dist/atf-c/tp.c                          |    78 +-
 external/bsd/atf/dist/atf-c/tp.h                          |    21 +-
 external/bsd/atf/dist/atf-c/tp_test.c                     |    52 +-
 external/bsd/atf/dist/atf-c/utils.c                       |    43 +
 external/bsd/atf/dist/atf-c/utils.h                       |    35 +
 external/bsd/atf/dist/atf-c/utils_test.c                  |    70 +
 external/bsd/atf/dist/atf-config/atf-config.1             |    10 +-
 external/bsd/atf/dist/atf-config/atf-config.cpp           |    10 +-
 external/bsd/atf/dist/atf-config/integration_test.sh      |     6 +-
 external/bsd/atf/dist/atf-report/fail_helper.cpp          |     2 +-
 external/bsd/atf/dist/atf-report/integration_test.sh      |    10 +-
 external/bsd/atf/dist/atf-report/misc_helpers.cpp         |    24 +-
 external/bsd/atf/dist/atf-report/reader.cpp               |    48 +-
 external/bsd/atf/dist/atf-report/reader_test.cpp          |    10 +-
 external/bsd/atf/dist/atf-report/tests-results.dtd        |     5 +
 external/bsd/atf/dist/atf-run/atffile.cpp                 |     8 +-
 external/bsd/atf/dist/atf-run/atffile.hpp                 |     5 +-
 external/bsd/atf/dist/atf-run/atffile_test.cpp            |    54 +-
 external/bsd/atf/dist/atf-run/config.cpp                  |    21 +-
 external/bsd/atf/dist/atf-run/config.hpp                  |     2 +-
 external/bsd/atf/dist/atf-run/config_test.cpp             |    17 +-
 external/bsd/atf/dist/atf-run/fs.cpp                      |     6 +-
 external/bsd/atf/dist/atf-run/fs.hpp                      |     2 +-
 external/bsd/atf/dist/atf-run/fs_test.cpp                 |   111 +-
 external/bsd/atf/dist/atf-run/integration_test.sh         |    53 +-
 external/bsd/atf/dist/atf-run/io.cpp                      |   361 ++++
 external/bsd/atf/dist/atf-run/io.hpp                      |   432 ++++
 external/bsd/atf/dist/atf-run/io_test.cpp                 |   469 +++++
 external/bsd/atf/dist/atf-run/misc_helpers.cpp            |   112 +-
 external/bsd/atf/dist/atf-run/requirements.cpp            |    14 +-
 external/bsd/atf/dist/atf-run/requirements.hpp            |     2 +-
 external/bsd/atf/dist/atf-run/requirements_test.cpp       |    12 +-
 external/bsd/atf/dist/atf-run/signals.cpp                 |   147 +
 external/bsd/atf/dist/atf-run/signals.hpp                 |    92 +
 external/bsd/atf/dist/atf-run/signals_test.cpp            |   275 +++
 external/bsd/atf/dist/atf-run/test_program_test.cpp       |   326 +-
 external/bsd/atf/dist/atf-run/timer.cpp                   |    15 +-
 external/bsd/atf/dist/atf-run/timer.hpp                   |    13 +-
 external/bsd/atf/dist/atf-run/user.cpp                    |    63 +
 external/bsd/atf/dist/atf-run/user.hpp                    |    48 +
 external/bsd/atf/dist/atf-run/user_test.cpp               |   140 +
 external/bsd/atf/dist/atf-sh/Atffile                      |     1 +
 external/bsd/atf/dist/atf-sh/atf-check.1                  |   151 +
 external/bsd/atf/dist/atf-sh/atf-check.cpp                |   834 +++++++++
 external/bsd/atf/dist/atf-sh/atf-check_test.sh            |   469 +++++
 external/bsd/atf/dist/atf-sh/atf-sh-api.3                 |     2 +-
 external/bsd/atf/dist/atf-sh/atf-sh.cpp                   |    17 +-
 external/bsd/atf/dist/atf-sh/libatf-sh.subr               |    26 +-
 external/bsd/atf/dist/atf-sh/misc_helpers.sh              |    11 +
 external/bsd/atf/dist/atf-sh/tc_test.sh                   |     4 +-
 external/bsd/atf/dist/doc/atf-test-case.4                 |     5 +-
 external/bsd/atf/dist/doc/atf.7.in                        |     8 +-
 external/bsd/atf/dist/test-programs/c_helpers.c           |     8 +-
 external/bsd/atf/dist/test-programs/cpp_helpers.cpp       |    19 +-
 external/bsd/atf/dist/test-programs/sh_helpers.sh         |     4 +-
 155 files changed, 22746 insertions(+), 1289 deletions(-)

diffs (truncated from 27465 to 300 lines):

diff -r a37cee700313 -r cf2817bd2e08 external/bsd/atf/dist/Atffile
--- a/external/bsd/atf/dist/Atffile     Wed Oct 20 08:56:16 2010 +0000
+++ b/external/bsd/atf/dist/Atffile     Wed Oct 20 09:14:17 2010 +0000
@@ -6,7 +6,6 @@
 tp: atf-c++
 tp: atf-sh
 tp: test-programs
-tp: atf-check
 tp: atf-config
 tp: atf-report
 tp: atf-run
diff -r a37cee700313 -r cf2817bd2e08 external/bsd/atf/dist/COPYING
--- a/external/bsd/atf/dist/COPYING     Wed Oct 20 08:56:16 2010 +0000
+++ b/external/bsd/atf/dist/COPYING     Wed Oct 20 09:14:17 2010 +0000
@@ -51,8 +51,8 @@
 
   Author: Julio Merino <jmmv%NetBSD.org@localhost>
 
-* atf-c++/io.hpp, atf-c++/io.cpp, tests/atf-c++/t_io.cpp: These files
-  were derived from the file_handle, systembuf, pipe, pistream and postream
+* atf-c++/detail/io.hpp, atf-c++/detail/io.cpp, atf-c++/detail/io_test.cpp:
+  These files were derived from the file_handle, systembuf, pipe and pistream
   classes and tests found in the Boost.Process library.
 
   Author: Julio Merino <jmmv84%gmail.com@localhost>
diff -r a37cee700313 -r cf2817bd2e08 external/bsd/atf/dist/NEWS
--- a/external/bsd/atf/dist/NEWS        Wed Oct 20 08:56:16 2010 +0000
+++ b/external/bsd/atf/dist/NEWS        Wed Oct 20 09:14:17 2010 +0000
@@ -2,6 +2,29 @@
 ===========================================================================
 
 
+Changes in version 0.11
+***********************
+
+Experimental version released on October 20th, 2010.
+
+* The ATF_CHECK* macros in atf-c++ were renamed to ATF_REQUIRE* to match
+  their counterparts in atf-c.
+
+* Clearly separated the modules in atf-c that are supposed to be public
+  from those that are implementation details.  The header files for the
+  internal modules are not installed any more.
+
+* Made the atf-check tool private.  It is only required by atf-sh and being
+  public has the danger of causing confusion.  Also, making it private
+  simplifies the public API of atf.
+
+* Changed atf-sh to enable per-command error checking (set -e) by default.
+  This catches many cases in which a test case is broken but it is not
+  reported as such because execution continues.
+
+* Fixed the XSTL and CSS stylesheets to support expected failures.
+
+
 Changes in version 0.10
 ***********************
 
diff -r a37cee700313 -r cf2817bd2e08 external/bsd/atf/dist/atf-c++/Atffile
--- a/external/bsd/atf/dist/atf-c++/Atffile     Wed Oct 20 08:56:16 2010 +0000
+++ b/external/bsd/atf/dist/atf-c++/Atffile     Wed Oct 20 09:14:17 2010 +0000
@@ -2,22 +2,13 @@
 
 prop: test-suite = atf
 
-tp: env_test
+tp: detail
+
+tp: atf_c++_test
+tp: build_test
+tp: check_test
 tp: config_test
-tp: text_test
-tp: fs_test
 tp: macros_test
-tp: io_test
-tp: expand_test
-tp: user_test
-tp: parser_test
-tp: signals_test
+tp: pkg_config_test
 tp: tests_test
 tp: utils_test
-tp: process_test
-tp: build_test
-tp: application_test
-tp: exceptions_test
-tp: sanity_test
-tp: ui_test
-tp: pkg_config_test
diff -r a37cee700313 -r cf2817bd2e08 external/bsd/atf/dist/atf-c++/atf-c++-api.3
--- a/external/bsd/atf/dist/atf-c++/atf-c++-api.3       Wed Oct 20 08:56:16 2010 +0000
+++ b/external/bsd/atf/dist/atf-c++/atf-c++-api.3       Wed Oct 20 09:14:17 2010 +0000
@@ -26,19 +26,19 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 28, 2010
+.Dd July 4, 2010
 .Dt ATF-C++-API 3
 .Os
 .Sh NAME
 .Nm ATF_ADD_TEST_CASE ,
-.Nm ATF_CHECK ,
-.Nm ATF_CHECK_EQUAL ,
 .Nm ATF_CHECK_ERRNO ,
-.Nm ATF_CHECK_THROW ,
 .Nm ATF_FAIL ,
 .Nm ATF_INIT_TEST_CASES ,
 .Nm ATF_PASS ,
+.Nm ATF_REQUIRE ,
+.Nm ATF_REQUIRE_EQ ,
 .Nm ATF_REQUIRE_ERRNO ,
+.Nm ATF_REQUIRE_THROW ,
 .Nm ATF_SKIP ,
 .Nm ATF_TEST_CASE ,
 .Nm ATF_TEST_CASE_BODY ,
@@ -50,14 +50,14 @@
 .Sh SYNOPSIS
 .In atf-c++.hpp
 .Fn ATF_ADD_TEST_CASE "tcs" "name"
-.Fn ATF_CHECK "expression"
-.Fn ATF_CHECK_EQUAL "expression_1" "expression_2"
 .Fn ATF_CHECK_ERRNO "exp_errno" "bool_expression"
-.Fn ATF_CHECK_THROW "expected_exception" "statement"
 .Fn ATF_FAIL "reason"
 .Fn ATF_INIT_TEST_CASES "tcs"
 .Fn ATF_PASS
+.Fn ATF_REQUIRE "expression"
+.Fn ATF_REQUIRE_EQ "expression_1" "expression_2"
 .Fn ATF_REQUIRE_ERRNO "exp_errno" "bool_expression"
+.Fn ATF_REQUIRE_THROW "expected_exception" "statement"
 .Fn ATF_SKIP "reason"
 .Fn ATF_TEST_CASE "name"
 .Fn ATF_TEST_CASE_BODY "name"
@@ -298,14 +298,14 @@
 .Fn ATF_FAIL
 with an appropriate error message.
 .Pp
-.Fn ATF_CHECK
+.Fn ATF_REQUIRE
 takes an expression and raises a failure if it evaluates to false.
 .Pp
-.Fn ATF_CHECK_EQUAL
+.Fn ATF_REQUIRE_EQ
 takes two expressions and raises a failure if the two do not evaluate to
 the same exact value.
 .Pp
-.Fn ATF_CHECK_THROW
+.Fn ATF_REQUIRE_THROW
 takes the name of an exception and a statement and raises a failure if
 the statement does not throw the specified exception.
 .Pp
@@ -331,13 +331,13 @@
 }
 ATF_TEST_CASE_BODY(addition)
 {
-    ATF_CHECK_EQUAL(0 + 0, 0);
-    ATF_CHECK_EQUAL(0 + 1, 1);
-    ATF_CHECK_EQUAL(1 + 0, 1);
+    ATF_REQUIRE_EQ(0 + 0, 0);
+    ATF_REQUIRE_EQ(0 + 1, 1);
+    ATF_REQUIRE_EQ(1 + 0, 1);
 
-    ATF_CHECK_EQUAL(1 + 1, 2);
+    ATF_REQUIRE_EQ(1 + 1, 2);
 
-    ATF_CHECK_EQUAL(100 + 200, 300);
+    ATF_REQUIRE_EQ(100 + 200, 300);
 }
 
 ATF_TEST_CASE(open_failure);
@@ -347,7 +347,7 @@
 }
 ATF_TEST_CASE_BODY(open_failure)
 {
-    ATF_CHECK_ERRNO(ENOENT, open("non-existent", O_RDONLY) == -1);
+    ATF_REQUIRE_ERRNO(ENOENT, open("non-existent", O_RDONLY) == -1);
 }
 
 ATF_TEST_CASE(known_bug);
@@ -358,9 +358,9 @@
 ATF_TEST_CASE_BODY(known_bug)
 {
     expect_fail("See bug number foo/bar");
-    ATF_CHECK_EQUAL(3, 1 + 1);
+    ATF_REQUIRE_EQ(3, 1 + 1);
     expect_pass();
-    ATF_CHECK_EQUAL(3, 1 + 2);
+    ATF_REQUIRE_EQ(3, 1 + 2);
 }
 
 ATF_INIT_TEST_CASES(tcs)
diff -r a37cee700313 -r cf2817bd2e08 external/bsd/atf/dist/atf-c++/atf_c++_test.cpp
--- a/external/bsd/atf/dist/atf-c++/atf_c++_test.cpp    Wed Oct 20 08:56:16 2010 +0000
+++ b/external/bsd/atf/dist/atf-c++/atf_c++_test.cpp    Wed Oct 20 09:14:17 2010 +0000
@@ -27,9 +27,9 @@
 // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 
-#include "atf-c++/macros.hpp"
+#include "macros.hpp"
 
-#include "test_helpers.hpp"
+#include "detail/test_helpers.hpp"
 
 // ------------------------------------------------------------------------
 // Tests cases for the header file.
diff -r a37cee700313 -r cf2817bd2e08 external/bsd/atf/dist/atf-c++/build.cpp
--- a/external/bsd/atf/dist/atf-c++/build.cpp   Wed Oct 20 08:56:16 2010 +0000
+++ b/external/bsd/atf/dist/atf-c++/build.cpp   Wed Oct 20 09:14:17 2010 +0000
@@ -30,11 +30,13 @@
 extern "C" {
 #include "atf-c/build.h"
 #include "atf-c/error.h"
+#include "atf-c/utils.h"
 }
 
-#include "atf-c++/build.hpp"
-#include "atf-c++/exceptions.hpp"
-#include "atf-c++/process.hpp"
+#include "build.hpp"
+
+#include "detail/exceptions.hpp"
+#include "detail/process.hpp"
 
 namespace impl = atf::build;
 #define IMPL_NAME "atf::build"
@@ -45,7 +47,7 @@
 
 inline
 atf::process::argv_array
-clist_to_argv(const atf_list_t* l)
+cargv_to_argv(const atf_list_t* l)
 {
     std::vector< const char* > aux;
 
@@ -58,14 +60,14 @@
 
 inline
 atf::process::argv_array
-clist_to_argv_and_free(atf_list_t* l)
+cargv_to_argv_and_free(char** l)
 {
     try {
-        atf::process::argv_array argv = clist_to_argv(l);
-        atf_list_fini(l);
+        atf::process::argv_array argv((const char* const*)l);
+        atf_utils_free_charpp(l);
         return argv;
     } catch (...) {
-        atf_list_fini(l);
+        atf_utils_free_charpp(l);
         throw;
     }
 }
@@ -76,42 +78,42 @@
 
 atf::process::argv_array
 impl::c_o(const std::string& sfile, const std::string& ofile,
-          const process::argv_array& optargs)
+          const atf::process::argv_array& optargs)
 {
-    atf_list_t l;
+    char** l;
 
     atf_error_t err = atf_build_c_o(sfile.c_str(), ofile.c_str(),
                                     optargs.exec_argv(), &l);
     if (atf_is_error(err))
         throw_atf_error(err);
 
-    return clist_to_argv_and_free(&l);
+    return cargv_to_argv_and_free(l);
 }
 
 atf::process::argv_array
 impl::cpp(const std::string& sfile, const std::string& ofile,
-          const process::argv_array& optargs)
+          const atf::process::argv_array& optargs)
 {
-    atf_list_t l;
+    char** l;
 
     atf_error_t err = atf_build_cpp(sfile.c_str(), ofile.c_str(),
                                     optargs.exec_argv(), &l);
     if (atf_is_error(err))
         throw_atf_error(err);
 
-    return clist_to_argv_and_free(&l);
+    return cargv_to_argv_and_free(l);
 }
 
 atf::process::argv_array
 impl::cxx_o(const std::string& sfile, const std::string& ofile,
-            const process::argv_array& optargs)
+            const atf::process::argv_array& optargs)
 {
-    atf_list_t l;
+    char** l;
 



Home | Main Index | Thread Index | Old Index