CVS commit: src/external/bsd/atf/dist/atf-sh
Module Name:src Committed By: gutteridge Date: Wed May 10 22:14:54 UTC 2023 Modified Files: src/external/bsd/atf/dist/atf-sh: atf-check.1 atf-sh.1 Log Message: atf-check.1 & atf-sh.1: remove references to -h option These had their -h option removed in the ATF 0.19 release, but these references in the man pages weren't (mostly) removed upstream until a later commit (that hasn't been released). To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/atf/dist/atf-sh/atf-check.1 \ src/external/bsd/atf/dist/atf-sh/atf-sh.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/dist/atf-sh/atf-check.1 diff -u src/external/bsd/atf/dist/atf-sh/atf-check.1:1.1.1.2 src/external/bsd/atf/dist/atf-sh/atf-check.1:1.2 --- src/external/bsd/atf/dist/atf-sh/atf-check.1:1.1.1.2 Mon Jan 16 22:36:52 2012 +++ src/external/bsd/atf/dist/atf-sh/atf-check.1 Wed May 10 22:14:54 2023 @@ -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 June 27, 2010 +.Dd May 10, 2023 .Dt ATF-CHECK 1 .Os .Sh NAME @@ -39,14 +39,11 @@ .Op Fl e Ar action:arg ... .Op Fl x .Ar command -.Nm -.Fl h .Sh DESCRIPTION .Nm executes a given command and analyzes its results, including exit code, stdout and stderr. .Pp -In the first synopsis form, .Nm will execute the provided command and apply checks specified by arguments. @@ -61,14 +58,8 @@ Multiple checks for the same output chan their results will be combined as a logical and (meaning that the output must match all the provided checks). .Pp -In the second synopsis form, -.Nm -will print information about all supported options and their purpose. -.Pp The following options are available: .Bl -tag -width XqualXvalueXX -.It Fl h -Shows a short summary of all available options and their purpose. .It Fl s Ar qual:value Analyzes termination status. Must be one of: Index: src/external/bsd/atf/dist/atf-sh/atf-sh.1 diff -u src/external/bsd/atf/dist/atf-sh/atf-sh.1:1.1.1.2 src/external/bsd/atf/dist/atf-sh/atf-sh.1:1.2 --- src/external/bsd/atf/dist/atf-sh/atf-sh.1:1.1.1.2 Sat Feb 8 19:11:32 2014 +++ src/external/bsd/atf/dist/atf-sh/atf-sh.1 Wed May 10 22:14:54 2023 @@ -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 October 15, 2013 +.Dd May 10, 2023 .Dt ATF-SH 1 .Os .Sh NAME @@ -35,8 +35,6 @@ .Sh SYNOPSIS .Nm .Ar script -.Nm -.Fl h .Sh DESCRIPTION .Nm is an interpreter that runs the test program given in @@ -62,12 +60,6 @@ should start with: .Bd -literal -offset indent #! /usr/bin/env atf-sh .Ed -.Pp -The following options are available: -.Bl -tag -width XhXX -.It Fl h -Shows a short summary of all available options and their purpose. -.El .Sh SEE ALSO .Xr atf-config 1 , .Xr atf-sh-api 3 ,
CVS commit: src/external/bsd/atf/dist/atf-sh
Module Name:src Committed By: gutteridge Date: Wed May 10 22:14:54 UTC 2023 Modified Files: src/external/bsd/atf/dist/atf-sh: atf-check.1 atf-sh.1 Log Message: atf-check.1 & atf-sh.1: remove references to -h option These had their -h option removed in the ATF 0.19 release, but these references in the man pages weren't (mostly) removed upstream until a later commit (that hasn't been released). To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/atf/dist/atf-sh/atf-check.1 \ src/external/bsd/atf/dist/atf-sh/atf-sh.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/atf/dist/atf-sh
Module Name:src
Committed By: mrg
Date: Fri Oct 4 09:19:19 UTC 2019
Modified Files:
src/external/bsd/atf/dist/atf-sh: atf-check.cpp
Log Message:
give a catch() a variable. gcc 8 is picky:
atf-check.cpp:221:23: error: catching polymorphic type 'class
std::runtime_error' by value [-Werror=catch-value=]
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/atf/dist/atf-sh/atf-check.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-sh/atf-check.cpp
diff -u src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.10 src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.11
--- src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.10 Fri Dec 4 01:43:58 2015
+++ src/external/bsd/atf/dist/atf-sh/atf-check.cpp Fri Oct 4 09:19:18 2019
@@ -218,7 +218,7 @@ parse_signal(const std::string& str)
if (signo == INT_MIN) {
try {
return atf::text::to_type< int >(str);
-} catch (std::runtime_error) {
+} catch (std::runtime_error ) {
throw atf::application::usage_error("Invalid signal name or number "
"in -s option");
}
CVS commit: src/external/bsd/atf/dist/atf-sh
Module Name:src Committed By: mrg Date: Fri Oct 4 09:19:19 UTC 2019 Modified Files: src/external/bsd/atf/dist/atf-sh: atf-check.cpp Log Message: give a catch() a variable. gcc 8 is picky: atf-check.cpp:221:23: error: catching polymorphic type 'class std::runtime_error' by value [-Werror=catch-value=] To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/bsd/atf/dist/atf-sh/atf-check.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/external/bsd/atf/dist/atf-sh
In article CADyfeQVHtEkhfydkA_XwgPhvqKirnUMRYjRV29c=6goznir...@mail.gmail.com, Julio Merino ju...@meroh.net wrote: On Fri, Jan 10, 2014 at 1:39 AM, Christos Zoulas chris...@netbsd.org wrote: Module Name:src Committed By: christos Date: Fri Jan 10 01:39:32 UTC 2014 Modified Files: src/external/bsd/atf/dist/atf-sh: libatf-sh.subr Log Message: Undo previous; unfortunately the cleanup routine gets called in a different shell so it can't cleanup stuff set in the environment of the first shell. What are you trying to fix? In the test case for t_hostent in lib/libc/net/, the tests initially contained the cleanup code after the test. If the test failed, then the cleanup did not get called. So I decided to use the _cleanup() feature of ATF. I ran the test with atf-run and the cleanup did not work. I wanted to examine the single test case that failed and I did not know how to run a single test case with atf-run. So I ran the test directly. The cleanup code did not get called which was unexpected. So I made that change and it worked for the most part but not in the error case. Then I realized that all the tests do set -e, so that makes the shell exit on error. That made me realize that the reason the cleanup does not work when it gets called from atf-run is because the cleanup is invoked in a separate shell, so the state of the test is lost (like shell variables set by the setup code). So I decided to set all the variables again during the cleanup. I would have preferred that the cleanup functionality was implemented differently, running in the context of the shell that ran the test. This could have been done by issuing a 'trap test_cleanup 0' before invoking the test, instead of all the complex stuff that is currently been done (unless I am missing something). I don't see how this prevents running tests in parallel. You just need to maintain one work directory for every test body/cleanup pair and delete the directory only after cleanup... and you cannot share work directories among tests anyway so you have to do that one way or another. If I need to pass state between the body of the test function and the cleanup function, where do I put that state? christos
Re: CVS commit: src/external/bsd/atf/dist/atf-sh
On Fri, Nov 26, 2010 at 12:04:36PM +, Antti Kantee wrote: Module Name: src Committed By: pooka Date: Fri Nov 26 12:04:36 UTC 2010 Modified Files: src/external/bsd/atf/dist/atf-sh: atf-check.cpp Log Message: Remove spammy (debug?) prints. took ages to figure out they were not coming from my application... XXX: the memcmp below looks suspicious XXX: Likewise for error messages. -- Nicolas Joly Biological Software and Databanks. Institut Pasteur, Paris.
