NetBSD Problem Report #44301

From www@NetBSD.org  Fri Dec 31 15:39:44 2010
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by www.NetBSD.org (Postfix) with ESMTP id 9ACAD63BA81
	for <gnats-bugs@gnats.NetBSD.org>; Fri, 31 Dec 2010 15:39:44 +0000 (UTC)
Message-Id: <20101231153944.7D3AB63B87A@www.NetBSD.org>
Date: Fri, 31 Dec 2010 15:39:44 +0000 (UTC)
From: pooka@iki.fi
Reply-To: pooka@iki.fi
To: gnats-bugs@NetBSD.org
Subject: atf should flag bogus tests explicitly
X-Send-Pr-Version: www-1.0

>Number:         44301
>Category:       bin
>Synopsis:       atf should flag bogus tests explicitly
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    jmmv
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Dec 31 15:40:16 +0000 2010
>Closed-Date:    Wed Jan 05 14:03:49 +0000 2011
>Last-Modified:  Thu Mar 31 16:45:04 +0000 2011
>Originator:     Antti Kantee
>Release:        
>Organization:
>Environment:
>Description:
See e.g.:

http://www.whooppee.com/~paul/amd64-results/688_atf.html

Observe that there is one bogus test program, but get no clue
as to which one is the bogus one.
>How-To-Repeat:

>Fix:
Output bogus test name(s) in test report.

>Release-Note:

>Audit-Trail:

Responsible-Changed-From-To: bin-bug-people->jmmv
Responsible-Changed-By: jmmv@NetBSD.org
Responsible-Changed-When: Fri, 31 Dec 2010 16:26:29 +0000
Responsible-Changed-Why:
My stuff.


State-Changed-From-To: open->analyzed
State-Changed-By: jmmv@NetBSD.org
State-Changed-When: Fri, 31 Dec 2010 16:26:29 +0000
State-Changed-Why:
This is a problem in the XSLT; the text and xml reports already show broken tests.


From: Paul Goyette <paul@whooppee.com>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: bin/44301: atf should flag bogus tests explicitly
Date: Fri, 31 Dec 2010 13:04:28 -0800 (PST)

   This message is in MIME format.  The first part should be readable text,
   while the remaining parts are likely unreadable without MIME-aware tools.

 --0-519933440-1293829468=:6977
 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed

 The attached patch does the job.  It has been sent privately to the 
 upstream maintainers.


 -------------------------------------------------------------------------
 | Paul Goyette     | PGP Key fingerprint:     | E-mail addresses:       |
 | Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com    |
 | Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net |
 | Kernel Developer |                          | pgoyette at netbsd.org  |
 -------------------------------------------------------------------------
 --0-519933440-1293829468=:6977
 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=test-results.xsl.diff
 Content-Transfer-Encoding: BASE64
 Content-ID: <Pine.NEB.4.64.1012311304280.6977@quicky.whooppee.com>
 Content-Description: 
 Content-Disposition: attachment; filename=test-results.xsl.diff

 LS0tIC91c3Ivc2hhcmUveHNsL2F0Zi90ZXN0cy1yZXN1bHRzLnhzbAkyMDEw
 LTEwLTIwIDA4OjU4OjUyLjAwMDAwMDAwMCAtMDcwMA0KKysrIHRlc3QtcmVz
 dWx0cy54c2wJMjAxMC0xMi0zMSAxMjoyMToyMS4wMDAwMDAwMDAgLTA4MDAN
 CkBAIC04Niw2ICs4Niw5IEBADQogICAgICAgICA8eHNsOmlmIHRlc3Q9IiRu
 dGNzLXNraXBwZWQgPiAwIj4NCiAgICAgICAgICAgPHhzbDpjYWxsLXRlbXBs
 YXRlIG5hbWU9InNraXBwZWQtdGNzLXN1bW1hcnkiIC8+DQogICAgICAgICA8
 L3hzbDppZj4NCisgICAgICAgIDx4c2w6aWYgdGVzdD0iJG50cHMtZmFpbGVk
 ID4gMCI+DQorICAgICAgICAgIDx4c2w6Y2FsbC10ZW1wbGF0ZSBuYW1lPSJm
 YWlsZWQtdHBzLXN1bW1hcnkiIC8+DQorICAgICAgICA8L3hzbDppZj4NCiAg
 ICAgICAgIDx4c2w6Y2FsbC10ZW1wbGF0ZSBuYW1lPSJpbmZvLWJvdHRvbSIg
 Lz4NCiANCiAgICAgICAgIDx4c2w6YXBwbHktdGVtcGxhdGVzIHNlbGVjdD0i
 dHAiIG1vZGU9ImRldGFpbHMiIC8+DQpAQCAtMTY3LDE0ICsxNzAsMTYgQEAN
 CiAgICAgICAgIDx0ZCBjbGFzcz0ibnVtZXJpYyI+PHA+PHhzbDp2YWx1ZS1v
 ZiBzZWxlY3Q9IiRudHBzIiAvPjwvcD48L3RkPg0KICAgICAgIDwvdHI+DQog
 ICAgICAgPHRyIGNsYXNzPSJlbnRyeSI+DQotICAgICAgICA8dGQ+PHA+Qm9n
 dXMgdGVzdCBwcm9ncmFtczwvcD48L3RkPg0KICAgICAgICAgPHhzbDpjaG9v
 c2U+DQogICAgICAgICAgIDx4c2w6d2hlbiB0ZXN0PSIkbnRwcy1mYWlsZWQg
 PiAwIj4NCisgICAgICAgICAgICA8dGQ+PHA+PGEgaHJlZj0iI2ZhaWxlZC10
 cHMtc3VtbWFyeSI+Qm9ndXMgdGVzdA0KKyAgICAgICAgICAgIHByb2dyYW1z
 PC9hPjwvcD48L3RkPg0KICAgICAgICAgICAgIDx0ZCBjbGFzcz0ibnVtZXJp
 Yy1lcnJvciI+DQogICAgICAgICAgICAgICA8cD48eHNsOnZhbHVlLW9mIHNl
 bGVjdD0iJG50cHMtZmFpbGVkIiAvPjwvcD4NCiAgICAgICAgICAgICA8L3Rk
 Pg0KICAgICAgICAgICA8L3hzbDp3aGVuPg0KICAgICAgICAgICA8eHNsOm90
 aGVyd2lzZT4NCisgICAgICAgICAgICA8dGQ+PHA+Qm9ndXMgdGVzdCBwcm9n
 cmFtczwvcD48L3RkPg0KICAgICAgICAgICAgIDx0ZCBjbGFzcz0ibnVtZXJp
 YyI+DQogICAgICAgICAgICAgICA8cD48eHNsOnZhbHVlLW9mIHNlbGVjdD0i
 JG50cHMtZmFpbGVkIiAvPjwvcD4NCiAgICAgICAgICAgICA8L3RkPg0KQEAg
 LTMxNCw2ICszMTksMjAgQEANCiAgICAgPC90YWJsZT4NCiAgIDwveHNsOnRl
 bXBsYXRlPg0KIA0KKyAgPHhzbDp0ZW1wbGF0ZSBuYW1lPSJmYWlsZWQtdHBz
 LXN1bW1hcnkiPg0KKyAgICA8YSBuYW1lPSJmYWlsZWQtdHBzLXN1bW1hcnki
 IC8+DQorICAgIDxoMiBpZD0iZmFpbGVkLXRwcy1zdW1tYXJ5Ij5Cb2d1cyB0
 ZXN0IHByb2dyYW1zIHN1bW1hcnk8L2gyPg0KKw0KKyAgICA8dGFibGUgY2xh
 c3M9InRjcy1zdW1tYXJ5Ij4NCisgICAgICA8dHI+DQorICAgICAgICA8dGg+
 VGVzdCBwcm9ncmFtPC90aD4NCisgICAgICA8L3RyPg0KKyAgICAgIDx4c2w6
 YXBwbHktdGVtcGxhdGVzIHNlbGVjdD0idHAiIG1vZGU9InN1bW1hcnkiPg0K
 KyAgICAgICAgPHhzbDp3aXRoLXBhcmFtIG5hbWU9IndoaWNoIj5ib2d1czwv
 eHNsOndpdGgtcGFyYW0+DQorICAgICAgPC94c2w6YXBwbHktdGVtcGxhdGVz
 Pg0KKyAgICA8L3RhYmxlPg0KKyAgPC94c2w6dGVtcGxhdGU+DQorDQogICA8
 eHNsOnRlbXBsYXRlIG5hbWU9InNraXBwZWQtdGNzLXN1bW1hcnkiPg0KICAg
 ICA8YSBuYW1lPSJza2lwcGVkLXRjcy1zdW1tYXJ5IiAvPg0KICAgICA8aDIg
 aWQ9InNraXBwZWQtdGNzLXN1bW1hcnkiPlNraXBwZWQgdGVzdCBjYXNlcyBz
 dW1tYXJ5PC9oMj4NCkBAIC0zMzUsNiArMzU0LDcgQEANCiANCiAgICAgPHhz
 bDp2YXJpYWJsZSBuYW1lPSJjaG9zZW4iPg0KICAgICAgIDx4c2w6Y2hvb3Nl
 Pg0KKyAgICAgICAgPHhzbDp3aGVuIHRlc3Q9IiR3aGljaCA9ICdib2d1cycg
 YW5kIGZhaWxlZCI+eWVzPC94c2w6d2hlbj4NCiAgICAgICAgIDx4c2w6d2hl
 biB0ZXN0PSIkd2hpY2ggPSAncGFzc2VkJyBhbmQgdGMvcGFzc2VkIj55ZXM8
 L3hzbDp3aGVuPg0KICAgICAgICAgPHhzbDp3aGVuIHRlc3Q9IiR3aGljaCA9
 ICdmYWlsZWQnIGFuZCB0Yy9mYWlsZWQiPnllczwveHNsOndoZW4+DQogICAg
 ICAgICA8eHNsOndoZW4gdGVzdD0iJHdoaWNoID0gJ3hmYWlsJyBhbmQNCkBA
 IC0zNTksOSArMzc5LDExIEBADQogICAgICAgICAgIDxwPjx4c2w6dmFsdWUt
 b2Ygc2VsZWN0PSJAaWQiIC8+PC9wPg0KICAgICAgICAgPC90ZD4NCiAgICAg
 ICA8L3RyPg0KLSAgICAgIDx4c2w6YXBwbHktdGVtcGxhdGVzIHNlbGVjdD0i
 dGMiIG1vZGU9InN1bW1hcnkiPg0KLSAgICAgICAgPHhzbDp3aXRoLXBhcmFt
 IG5hbWU9IndoaWNoIiBzZWxlY3Q9IiR3aGljaCIgLz4NCi0gICAgICA8L3hz
 bDphcHBseS10ZW1wbGF0ZXM+DQorICAgICAgPHhzbDppZiB0ZXN0PSIkd2hp
 Y2ggIT0gJ2JvZ3VzJyI+DQorICAgICAgICA8eHNsOmFwcGx5LXRlbXBsYXRl
 cyBzZWxlY3Q9InRjIiBtb2RlPSJzdW1tYXJ5Ij4NCisgICAgICAgICAgPHhz
 bDp3aXRoLXBhcmFtIG5hbWU9IndoaWNoIiBzZWxlY3Q9IiR3aGljaCIgLz4N
 CisgICAgICAgIDwveHNsOmFwcGx5LXRlbXBsYXRlcz4NCisgICAgICA8L3hz
 bDppZj4NCiAgICAgPC94c2w6aWY+DQogICA8L3hzbDp0ZW1wbGF0ZT4NCiAN
 Cg==

 --0-519933440-1293829468=:6977--

State-Changed-From-To: analyzed->closed
State-Changed-By: jmmv@NetBSD.org
State-Changed-When: Wed, 05 Jan 2011 14:03:49 +0000
State-Changed-Why:
The patch does indeed fix the problem.  Applied upstream and in NetBSD.
Thanks!


From: "Julio Merino" <jmmv@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/44301 CVS commit: src/external/bsd/atf/dist/atf-report
Date: Wed, 5 Jan 2011 14:03:08 +0000

 Module Name:	src
 Committed By:	jmmv
 Date:		Wed Jan  5 14:03:08 UTC 2011

 Modified Files:
 	src/external/bsd/atf/dist/atf-report: tests-results.xsl

 Log Message:
 Cherry-pick upstream revision f791048924a1b68da070f17dfd5e5c2d825dd018:

 Report bogus test programs in the HTML output

 From Paul Goyette in private mail.  Fixes PR bin/44301.


 To generate a diff of this commit:
 cvs rdiff -u -r1.4 -r1.5 \
     src/external/bsd/atf/dist/atf-report/tests-results.xsl

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

From: "Julio Merino" <jmmv@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/44301 CVS commit: pkgsrc/devel/atf
Date: Thu, 31 Mar 2011 16:30:12 +0000

 Module Name:	pkgsrc
 Committed By:	jmmv
 Date:		Thu Mar 31 16:30:12 UTC 2011

 Modified Files:
 	pkgsrc/devel/atf: Makefile PLIST distinfo

 Log Message:
 Update atf to 0.13:

 Experimental version released on March 31st, 2011.

 This is the first release after the creation of the Kyua project, a more
 modular and reliable replacement for ATF.  From now on, ATF will change to
 accomodate the transition to this new codebase, but ATF will still continue
 to see development in the short/medium term.  Check out the project page at
 http://code.google.com/p/kyua/ for more details.

 The changes in this release are:

 * Added support to run the tests with the Kyua runtime engine (kyua-cli), a
   new package that aims to replace atf-run and atf-report.  The ATF tests
   can be run with the new system by issuing a 'make installcheck-kyua' from
   the top-level directory of the project (assuming the 'kyua' binary is
   available during the configuration stage of ATF).

 * atf-run and atf-report are now in maintenance mode (but *not* deprecated
   yet!).  Kyua already implements a new, much more reliable runtime engine
   that provides similar features to these tools.  That said, it is not
   complete yet so all development efforts should go towards it.

 * If GDB is installed, atf-run dumps the stack trace of crashing test
   programs in an attempt to aid debugging.  Contributed by Antti Kantee.

 * Reverted default timeout change in previous release and reset its value
   to 5 minutes.  This was causing several issues, specially when running
   the existing NetBSD test suite in qemu.

 * Fixed the 'match' output checker in atf-check to properly validate the
   last line of a file even if it does not have a newline.

 * Added the ATF_REQUIRE_IN and ATF_REQUIRE_NOT_IN macros to atf-c++ to
   check for the presence (or lack thereof) of an element in a collection.

 * PR bin/44176: Fixed a race condition in atf-run that would crash atf-run
   when the cleanup of a test case triggered asynchronous modifications to
   its work directory (e.g. killing a daemon process that cleans up a pid
   file in the work directory).

 * PR bin/44301: Fixed the sample XSLT file to report bogus test programs
   instead of just listing them as having 0 test cases.


 To generate a diff of this commit:
 cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/atf/Makefile
 cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/atf/PLIST
 cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/atf/distinfo

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

From: "Julio Merino" <jmmv@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/44301 CVS commit: src/external/bsd/atf/dist
Date: Thu, 31 Mar 2011 16:41:18 +0000

 Module Name:	src
 Committed By:	jmmv
 Date:		Thu Mar 31 16:41:17 UTC 2011

 Update of /cvsroot/src/external/bsd/atf/dist
 In directory ivanova.netbsd.org:/tmp/cvs-serv24817

 Log Message:
 Import atf-0.13:

 Experimental version released on March 31st, 2011.

 This is the first release after the creation of the Kyua project, a more
 modular and reliable replacement for ATF.  From now on, ATF will change to
 accomodate the transition to this new codebase, but ATF will still continue
 to see development in the short/medium term.  Check out the project page at
 http://code.google.com/p/kyua/ for more details.

 The changes in this release are:

 * Added support to run the tests with the Kyua runtime engine (kyua-cli), a
   new package that aims to replace atf-run and atf-report.  The ATF tests
   can be run with the new system by issuing a 'make installcheck-kyua' from
   the top-level directory of the project (assuming the 'kyua' binary is
   available during the configuration stage of ATF).

 * atf-run and atf-report are now in maintenance mode (but *not* deprecated
   yet!).  Kyua already implements a new, much more reliable runtime engine
   that provides similar features to these tools.  That said, it is not
   complete yet so all development efforts should go towards it.

 * If GDB is installed, atf-run dumps the stack trace of crashing test
   programs in an attempt to aid debugging.  Contributed by Antti Kantee.

 * Reverted default timeout change in previous release and reset its value
   to 5 minutes.  This was causing several issues, specially when running
   the existing NetBSD test suite in qemu.

 * Fixed the 'match' output checker in atf-check to properly validate the
   last line of a file even if it does not have a newline.

 * Added the ATF_REQUIRE_IN and ATF_REQUIRE_NOT_IN macros to atf-c++ to
   check for the presence (or lack thereof) of an element in a collection.

 * PR bin/44176: Fixed a race condition in atf-run that would crash atf-run
   when the cleanup of a test case triggered asynchronous modifications to
   its work directory (e.g. killing a daemon process that cleans up a pid
   file in the work directory).

 * PR bin/44301: Fixed the sample XSLT file to report bogus test programs
   instead of just listing them as having 0 test cases.

 Status:

 Vendor Tag:	TNF
 Release Tags:	atf-0-13

 U src/external/bsd/atf/dist/README
 U src/external/bsd/atf/dist/Atffile
 U src/external/bsd/atf/dist/atf-c.h
 U src/external/bsd/atf/dist/atf-c++.hpp
 U src/external/bsd/atf/dist/AUTHORS
 U src/external/bsd/atf/dist/COPYING
 U src/external/bsd/atf/dist/NEWS
 N src/external/bsd/atf/dist/Kyuafile
 U src/external/bsd/atf/dist/atf-c/error_fwd.h
 U src/external/bsd/atf/dist/atf-c/build.h
 U src/external/bsd/atf/dist/atf-c/check.h
 U src/external/bsd/atf/dist/atf-c/config.h
 U src/external/bsd/atf/dist/atf-c/error.h
 U src/external/bsd/atf/dist/atf-c/atf-c-api.3
 U src/external/bsd/atf/dist/atf-c/macros.h
 U src/external/bsd/atf/dist/atf-c/tc.h
 U src/external/bsd/atf/dist/atf-c/tp.h
 U src/external/bsd/atf/dist/atf-c/utils.h
 U src/external/bsd/atf/dist/atf-c/pkg_config_test.sh
 U src/external/bsd/atf/dist/atf-c/defs.h.in
 U src/external/bsd/atf/dist/atf-c/build.c
 U src/external/bsd/atf/dist/atf-c/check.c
 U src/external/bsd/atf/dist/atf-c/config.c
 U src/external/bsd/atf/dist/atf-c/error.c
 U src/external/bsd/atf/dist/atf-c/tc.c
 U src/external/bsd/atf/dist/atf-c/tp.c
 U src/external/bsd/atf/dist/atf-c/utils.c
 U src/external/bsd/atf/dist/atf-c/h_build.h
 U src/external/bsd/atf/dist/atf-c/atf_c_test.c
 U src/external/bsd/atf/dist/atf-c/build_test.c
 U src/external/bsd/atf/dist/atf-c/check_test.c
 U src/external/bsd/atf/dist/atf-c/config_test.c
 U src/external/bsd/atf/dist/atf-c/tc_test.c
 U src/external/bsd/atf/dist/atf-c/error_test.c
 U src/external/bsd/atf/dist/atf-c/macros_test.c
 U src/external/bsd/atf/dist/atf-c/tp_test.c
 U src/external/bsd/atf/dist/atf-c/utils_test.c
 U src/external/bsd/atf/dist/atf-c/atf-c.pc.in
 C src/external/bsd/atf/dist/atf-c/Atffile
 N src/external/bsd/atf/dist/atf-c/Kyuafile
 U src/external/bsd/atf/dist/atf-c/macros_h_test.c
 U src/external/bsd/atf/dist/atf-c/detail/process_helpers.c
 U src/external/bsd/atf/dist/atf-c/detail/test_helpers.c
 U src/external/bsd/atf/dist/atf-c/detail/test_helpers.h
 U src/external/bsd/atf/dist/atf-c/detail/dynstr.c
 U src/external/bsd/atf/dist/atf-c/detail/dynstr.h
 U src/external/bsd/atf/dist/atf-c/detail/env.c
 U src/external/bsd/atf/dist/atf-c/detail/env.h
 U src/external/bsd/atf/dist/atf-c/detail/fs.c
 U src/external/bsd/atf/dist/atf-c/detail/fs.h
 U src/external/bsd/atf/dist/atf-c/detail/list.c
 U src/external/bsd/atf/dist/atf-c/detail/list.h
 U src/external/bsd/atf/dist/atf-c/detail/map.c
 U src/external/bsd/atf/dist/atf-c/detail/map.h
 U src/external/bsd/atf/dist/atf-c/detail/process.c
 U src/external/bsd/atf/dist/atf-c/detail/process.h
 U src/external/bsd/atf/dist/atf-c/detail/sanity.c
 U src/external/bsd/atf/dist/atf-c/detail/sanity.h
 U src/external/bsd/atf/dist/atf-c/detail/text.c
 U src/external/bsd/atf/dist/atf-c/detail/text.h
 U src/external/bsd/atf/dist/atf-c/detail/tp_main.c
 U src/external/bsd/atf/dist/atf-c/detail/user.c
 U src/external/bsd/atf/dist/atf-c/detail/user.h
 U src/external/bsd/atf/dist/atf-c/detail/dynstr_test.c
 U src/external/bsd/atf/dist/atf-c/detail/env_test.c
 U src/external/bsd/atf/dist/atf-c/detail/fs_test.c
 U src/external/bsd/atf/dist/atf-c/detail/list_test.c
 U src/external/bsd/atf/dist/atf-c/detail/map_test.c
 U src/external/bsd/atf/dist/atf-c/detail/test_helpers_test.c
 U src/external/bsd/atf/dist/atf-c/detail/process_test.c
 U src/external/bsd/atf/dist/atf-c/detail/sanity_test.c
 U src/external/bsd/atf/dist/atf-c/detail/text_test.c
 U src/external/bsd/atf/dist/atf-c/detail/user_test.c
 U src/external/bsd/atf/dist/atf-c/detail/Atffile
 N src/external/bsd/atf/dist/atf-c/detail/Kyuafile
 U src/external/bsd/atf/dist/atf-c++/atf-c++-api.3
 U src/external/bsd/atf/dist/atf-c++/build.hpp
 U src/external/bsd/atf/dist/atf-c++/check.hpp
 U src/external/bsd/atf/dist/atf-c++/config.hpp
 U src/external/bsd/atf/dist/atf-c++/macros.hpp
 U src/external/bsd/atf/dist/atf-c++/tests.hpp
 U src/external/bsd/atf/dist/atf-c++/utils.hpp
 U src/external/bsd/atf/dist/atf-c++/macros_hpp_test.cpp
 U src/external/bsd/atf/dist/atf-c++/build.cpp
 U src/external/bsd/atf/dist/atf-c++/check.cpp
 U src/external/bsd/atf/dist/atf-c++/config.cpp
 U src/external/bsd/atf/dist/atf-c++/tests.cpp
 U src/external/bsd/atf/dist/atf-c++/atf_c++_test.cpp
 U src/external/bsd/atf/dist/atf-c++/build_test.cpp
 U src/external/bsd/atf/dist/atf-c++/check_test.cpp
 U src/external/bsd/atf/dist/atf-c++/config_test.cpp
 U src/external/bsd/atf/dist/atf-c++/macros_test.cpp
 U src/external/bsd/atf/dist/atf-c++/tests_test.cpp
 U src/external/bsd/atf/dist/atf-c++/utils_test.cpp
 U src/external/bsd/atf/dist/atf-c++/Atffile
 U src/external/bsd/atf/dist/atf-c++/atf-c++.pc.in
 N src/external/bsd/atf/dist/atf-c++/Kyuafile
 U src/external/bsd/atf/dist/atf-c++/pkg_config_test.sh
 U src/external/bsd/atf/dist/atf-c++/detail/test_helpers.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/test_helpers.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/application.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/application.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/env.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/env.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/exceptions.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/exceptions.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/expand.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/expand.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/fs.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/fs.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/parser.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/parser.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/process.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/process.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/sanity.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/text.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/text.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/ui.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/ui.hpp
 U src/external/bsd/atf/dist/atf-c++/detail/application_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/Atffile
 U src/external/bsd/atf/dist/atf-c++/detail/env_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/exceptions_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/expand_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/fs_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/parser_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/process_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/sanity_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/text_test.cpp
 U src/external/bsd/atf/dist/atf-c++/detail/ui_test.cpp
 N src/external/bsd/atf/dist/atf-c++/detail/Kyuafile
 U src/external/bsd/atf/dist/atf-config/atf-config.1
 C src/external/bsd/atf/dist/atf-config/integration_test.sh
 U src/external/bsd/atf/dist/atf-config/atf-config.cpp
 U src/external/bsd/atf/dist/atf-config/Atffile
 N src/external/bsd/atf/dist/atf-config/Kyuafile
 U src/external/bsd/atf/dist/atf-report/atf-report.1
 U src/external/bsd/atf/dist/atf-report/tests-results.css
 U src/external/bsd/atf/dist/atf-report/atf-report.cpp
 U src/external/bsd/atf/dist/atf-report/reader.cpp
 U src/external/bsd/atf/dist/atf-report/reader.hpp
 U src/external/bsd/atf/dist/atf-report/fail_helper.cpp
 U src/external/bsd/atf/dist/atf-report/misc_helpers.cpp
 U src/external/bsd/atf/dist/atf-report/pass_helper.cpp
 U src/external/bsd/atf/dist/atf-report/reader_test.cpp
 U src/external/bsd/atf/dist/atf-report/tests-results.dtd
 C src/external/bsd/atf/dist/atf-report/tests-results.xsl
 U src/external/bsd/atf/dist/atf-report/Atffile
 N src/external/bsd/atf/dist/atf-report/Kyuafile
 U src/external/bsd/atf/dist/atf-report/integration_test.sh
 U src/external/bsd/atf/dist/atf-run/atf-run.1
 U src/external/bsd/atf/dist/atf-run/requirements.cpp
 C src/external/bsd/atf/dist/atf-run/atf-run.cpp
 U src/external/bsd/atf/dist/atf-run/atffile.cpp
 U src/external/bsd/atf/dist/atf-run/atffile.hpp
 U src/external/bsd/atf/dist/atf-run/config.cpp
 U src/external/bsd/atf/dist/atf-run/config.hpp
 C src/external/bsd/atf/dist/atf-run/fs.cpp
 U src/external/bsd/atf/dist/atf-run/fs.hpp
 U src/external/bsd/atf/dist/atf-run/io.cpp
 U src/external/bsd/atf/dist/atf-run/io.hpp
 U src/external/bsd/atf/dist/atf-run/bad_metadata_helper.c
 U src/external/bsd/atf/dist/atf-run/requirements.hpp
 U src/external/bsd/atf/dist/atf-run/signals.cpp
 U src/external/bsd/atf/dist/atf-run/signals.hpp
 C src/external/bsd/atf/dist/atf-run/test-program.cpp
 U src/external/bsd/atf/dist/atf-run/test-program.hpp
 U src/external/bsd/atf/dist/atf-run/timer.cpp
 U src/external/bsd/atf/dist/atf-run/timer.hpp
 U src/external/bsd/atf/dist/atf-run/user.cpp
 U src/external/bsd/atf/dist/atf-run/user.hpp
 U src/external/bsd/atf/dist/atf-run/Atffile
 U src/external/bsd/atf/dist/atf-run/atffile_test.cpp
 U src/external/bsd/atf/dist/atf-run/requirements_test.cpp
 C src/external/bsd/atf/dist/atf-run/config_test.cpp
 U src/external/bsd/atf/dist/atf-run/expect_helpers.c
 U src/external/bsd/atf/dist/atf-run/fs_test.cpp
 U src/external/bsd/atf/dist/atf-run/io_test.cpp
 U src/external/bsd/atf/dist/atf-run/misc_helpers.cpp
 U src/external/bsd/atf/dist/atf-run/pass_helper.cpp
 C src/external/bsd/atf/dist/atf-run/test_program_test.cpp
 U src/external/bsd/atf/dist/atf-run/several_tcs_helper.c
 U src/external/bsd/atf/dist/atf-run/signals_test.cpp
 U src/external/bsd/atf/dist/atf-run/zero_tcs_helper.c
 U src/external/bsd/atf/dist/atf-run/user_test.cpp
 N src/external/bsd/atf/dist/atf-run/Kyuafile
 C src/external/bsd/atf/dist/atf-run/integration_test.sh
 U src/external/bsd/atf/dist/atf-run/sample/atf-run.hooks
 U src/external/bsd/atf/dist/atf-run/sample/common.conf
 U src/external/bsd/atf/dist/atf-run/share/atf-run.hooks
 U src/external/bsd/atf/dist/atf-sh/atf-check.1
 U src/external/bsd/atf/dist/atf-sh/atf-sh.1
 U src/external/bsd/atf/dist/atf-sh/atf-sh-api.3
 U src/external/bsd/atf/dist/atf-sh/atf_check_test.sh
 C src/external/bsd/atf/dist/atf-sh/atf-check.cpp
 U src/external/bsd/atf/dist/atf-sh/atf-sh.cpp
 U src/external/bsd/atf/dist/atf-sh/libatf-sh.subr
 U src/external/bsd/atf/dist/atf-sh/Atffile
 N src/external/bsd/atf/dist/atf-sh/Kyuafile
 U src/external/bsd/atf/dist/atf-sh/misc_helpers.sh
 C src/external/bsd/atf/dist/atf-sh/atf-check_test.sh
 U src/external/bsd/atf/dist/atf-sh/config_test.sh
 U src/external/bsd/atf/dist/atf-sh/integration_test.sh
 U src/external/bsd/atf/dist/atf-sh/normalize_test.sh
 U src/external/bsd/atf/dist/atf-sh/tc_test.sh
 U src/external/bsd/atf/dist/atf-sh/tp_test.sh
 U src/external/bsd/atf/dist/atf-version/generate-revision.sh
 U src/external/bsd/atf/dist/atf-version/atf-version.1
 U src/external/bsd/atf/dist/atf-version/atf-version.cpp
 U src/external/bsd/atf/dist/doc/atf-test-program.1
 U src/external/bsd/atf/dist/doc/atf-formats.5
 C src/external/bsd/atf/dist/doc/atf-test-case.4
 U src/external/bsd/atf/dist/doc/atf.7.in
 U src/external/bsd/atf/dist/test-programs/meta_data_test.sh
 U src/external/bsd/atf/dist/test-programs/c_helpers.c
 U src/external/bsd/atf/dist/test-programs/cpp_helpers.cpp
 U src/external/bsd/atf/dist/test-programs/Atffile
 N src/external/bsd/atf/dist/test-programs/Kyuafile
 U src/external/bsd/atf/dist/test-programs/common.sh
 U src/external/bsd/atf/dist/test-programs/sh_helpers.sh
 U src/external/bsd/atf/dist/test-programs/config_test.sh
 U src/external/bsd/atf/dist/test-programs/expect_test.sh
 U src/external/bsd/atf/dist/test-programs/fork_test.sh
 U src/external/bsd/atf/dist/test-programs/result_test.sh
 U src/external/bsd/atf/dist/test-programs/srcdir_test.sh

 12 conflicts created by this import.
 Use the following command to help the merge:

 	cvs checkout -jTNF:yesterday -jTNF src/external/bsd/atf/dist

>Unformatted:

Home	PR Database Search