From owner-svn-soc-all@freebsd.org Thu May 24 12:07:09 2018 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A3ED6EEE053 for ; Thu, 24 May 2018 12:07:09 +0000 (UTC) (envelope-from aniketp@FreeBSD.org) Received: from mxrelay.ysv.freebsd.org (mxrelay.ysv.freebsd.org [IPv6:2001:1900:2254:206a::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.ysv.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47BD9875FA for ; Thu, 24 May 2018 12:07:09 +0000 (UTC) (envelope-from aniketp@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.ysv.freebsd.org (Postfix) with ESMTPS id 8CFD398CF for ; Thu, 24 May 2018 12:07:08 +0000 (UTC) (envelope-from aniketp@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id w4OC78mq098353 for ; Thu, 24 May 2018 12:07:08 GMT (envelope-from aniketp@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id w4OC77hG097356 for svn-soc-all@FreeBSD.org; Thu, 24 May 2018 12:07:07 GMT (envelope-from aniketp@FreeBSD.org) Date: Thu, 24 May 2018 12:07:07 GMT Message-Id: <201805241207.w4OC77hG097356@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to aniketp@FreeBSD.org using -f From: aniketp@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r337248 - soc2018/aniketp/head/tests/sys/audit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 May 2018 12:07:09 -0000 Author: aniketp Date: Thu May 24 12:07:06 2018 New Revision: 337248 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=337248 Log: Improvements in test-case semantics (exec) audit_class Modified: soc2018/aniketp/head/tests/sys/audit/exec.c Modified: soc2018/aniketp/head/tests/sys/audit/exec.c ============================================================================== --- soc2018/aniketp/head/tests/sys/audit/exec.c Thu May 24 11:58:32 2018 (r337247) +++ soc2018/aniketp/head/tests/sys/audit/exec.c Thu May 24 12:07:06 2018 (r337248) @@ -38,7 +38,9 @@ static pid_t pid; static int status; static struct pollfd fds[1]; +static char bin[] = "/usr/bin/true"; static char argument[] = "sample-argument"; +static char *arg[] = {bin, argument, NULL}; ATF_TC_WITH_CLEANUP(execve_success); @@ -50,10 +52,7 @@ ATF_TC_BODY(execve_success, tc) { - char bin[] = "/usr/bin/true"; - - const char *regex = "execve.*sample-argument"; - char *arg[] = {bin, argument, NULL}; + const char *regex = "execve.*sample-argument.*Unknown error: 201"; FILE *pipefd = setup(fds, "ex"); ATF_REQUIRE((pid = fork()) != -1); @@ -61,9 +60,8 @@ ATF_REQUIRE(wait(&status) != -1); check_audit(fds, regex, pipefd); } - else { + else ATF_REQUIRE(execve(bin, arg, NULL) != -1); - } } ATF_TC_CLEANUP(execve_success, tc) @@ -81,9 +79,7 @@ ATF_TC_BODY(execve_failure, tc) { - char bin[] = "/does/not/exist"; - const char *regex = "execve.*sample-argument.*return,failure"; - char *arg[] = {bin, argument, NULL}; + const char *regex = "execve.*return,failure : Bad address"; FILE *pipefd = setup(fds, "ex"); ATF_REQUIRE((pid = fork()) != -1); @@ -91,9 +87,8 @@ ATF_REQUIRE(wait(&status) != -1); check_audit(fds, regex, pipefd); } - else { - ATF_REQUIRE_EQ(-1, execve(bin, arg, NULL)); - } + else + ATF_REQUIRE_EQ(-1, execve(bin, arg, (char *const *)(-1))); } ATF_TC_CLEANUP(execve_failure, tc)