svn commit: r350512 - head/tests/sys/kern

Mark Johnston markj at freebsd.org
Wed Aug 7 20:27:37 UTC 2019


On Thu, Aug 01, 2019 at 06:19:16PM +0000, Li-Wen Hsu wrote:
> Author: lwhsu
> Date: Thu Aug  1 18:19:16 2019
> New Revision: 350512
> URL: https://svnweb.freebsd.org/changeset/base/350512
> 
> Log:
>   Only skip test cases sometimes failing in CI when they are running in CI
>   
>   Suggested by:	jhb
>   Sponsored by:	The FreeBSD Foundation

This seems to break running the tests manually; atf dies because the
"ci" variable is not defined.  I have to use an invocation like this to
avoid that:

$ kyua -v test_suites.FreeBSD.ci=false test ptrace_test

I suspect that share/mk/suite.test.mk needs to be augmented somehow to
set this variable to "false" by default, so that the CI infrastructure
can override that.

> Modified:
>   head/tests/sys/kern/ptrace_test.c
> 
> Modified: head/tests/sys/kern/ptrace_test.c
> ==============================================================================
> --- head/tests/sys/kern/ptrace_test.c	Thu Aug  1 17:59:56 2019	(r350511)
> +++ head/tests/sys/kern/ptrace_test.c	Thu Aug  1 18:19:16 2019	(r350512)
> @@ -258,7 +258,8 @@ ATF_TC_BODY(ptrace__parent_sees_exit_after_child_debug
>  	int cpipe[2], dpipe[2], status;
>  	char c;
>  
> -	atf_tc_skip("https://bugs.freebsd.org/239399");
> +	if (atf_tc_get_config_var_as_bool(tc, "ci"))
> +		atf_tc_skip("https://bugs.freebsd.org/239399");
>  
>  	ATF_REQUIRE(pipe(cpipe) == 0);
>  	ATF_REQUIRE((child = fork()) != -1);
> @@ -801,7 +802,8 @@ ATF_TC_BODY(ptrace__follow_fork_both_attached_unrelate
>  	pid_t children[2], fpid, wpid;
>  	int cpipe[2], status;
>  
> -	atf_tc_skip("https://bugs.freebsd.org/239397");
> +	if (atf_tc_get_config_var_as_bool(tc, "ci"))
> +		atf_tc_skip("https://bugs.freebsd.org/239397");
>  
>  	ATF_REQUIRE(pipe(cpipe) == 0);
>  	ATF_REQUIRE((fpid = fork()) != -1);
> @@ -871,7 +873,8 @@ ATF_TC_BODY(ptrace__follow_fork_child_detached_unrelat
>  	pid_t children[2], fpid, wpid;
>  	int cpipe[2], status;
>  
> -	atf_tc_skip("https://bugs.freebsd.org/239292");
> +	if (atf_tc_get_config_var_as_bool(tc, "ci"))
> +		atf_tc_skip("https://bugs.freebsd.org/239292");
>  
>  	ATF_REQUIRE(pipe(cpipe) == 0);
>  	ATF_REQUIRE((fpid = fork()) != -1);
> @@ -936,7 +939,8 @@ ATF_TC_BODY(ptrace__follow_fork_parent_detached_unrela
>  	pid_t children[2], fpid, wpid;
>  	int cpipe[2], status;
>  
> -	atf_tc_skip("https://bugs.freebsd.org/239425");
> +	if (atf_tc_get_config_var_as_bool(tc, "ci"))
> +		atf_tc_skip("https://bugs.freebsd.org/239425");
>  
>  	ATF_REQUIRE(pipe(cpipe) == 0);
>  	ATF_REQUIRE((fpid = fork()) != -1);
> @@ -2084,7 +2088,8 @@ ATF_TC_BODY(ptrace__PT_KILL_competing_stop, tc)
>  	struct ptrace_lwpinfo pl;
>  	struct sched_param sched_param;
>  
> -	atf_tc_skip("https://bugs.freebsd.org/220841");
> +	if (atf_tc_get_config_var_as_bool(tc, "ci"))
> +		atf_tc_skip("https://bugs.freebsd.org/220841");
>  
>  	ATF_REQUIRE((fpid = fork()) != -1);
>  	if (fpid == 0) {
> 


More information about the svn-src-all mailing list