From owner-p4-projects@FreeBSD.ORG Sun Jan 18 17:50:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A20AA1065678; Sun, 18 Jan 2009 17:50:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44CFD1065674 for ; Sun, 18 Jan 2009 17:50:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 298598FC18 for ; Sun, 18 Jan 2009 17:50:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0IHomZF003768 for ; Sun, 18 Jan 2009 17:50:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0IHom5g003766 for perforce@freebsd.org; Sun, 18 Jan 2009 17:50:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 18 Jan 2009 17:50:48 GMT Message-Id: <200901181750.n0IHom5g003766@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 156340 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jan 2009 17:50:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=156340 Change 156340 by rwatson@rwatson_freebsd_capabilities on 2009/01/18 17:50:41 Consistently check pid returned by pdgetpid() in regression test. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#3 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#2 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/procdesc/procdesc_test.c#3 $ */ #include @@ -81,6 +81,9 @@ sleep(10); if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); + if (pid != realpid) + errx(-1, "pdfork pid %d pdgetpid pid %d", realpid, + pid); if (fstat(fd, &sb) < 0) err(-1, "fstat"); if (sb.st_mode != S_IFREG) @@ -91,15 +94,18 @@ printf("2. pdfork() and close() before child exits itself.\n"); - pid = pdfork(&fd); - if (pid < 0) + realpid = pdfork(&fd); + if (realpid < 0) err(-1, "pdfork"); - if (pid == 0) { + if (realpid == 0) { if (execve(sleep_argv[0], sleep_argv, environ) < 0) err(-1, "%s", sleep_argv[0]); } else { if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); + if (pid != realpid) + errx(-1, "pdfork pid %d pdgetpid pid %d", realpid, + pid); if (fstat(fd, &sb) < 0) err(-1, "fstat"); if (sb.st_mode != (S_IFREG | S_IRWXU)) @@ -108,6 +114,9 @@ sleep(2); if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); + if (pid != realpid) + errx(-1, "pdfork pid %d pdgetpid pid %d", realpid, + pid); if (fstat(fd, &sb) < 0) err(-1, "fstat"); if (sb.st_mode != (S_IFREG | S_IRWXU)) @@ -118,15 +127,18 @@ printf("3. pdfork() and pdkill() before child exits itself.\n"); - pid = pdfork(&fd); - if (pid < 0) + realpid = pdfork(&fd); + if (realpid < 0) err(-1, "pdfork"); - if (pid == 0) { + if (realpid == 0) { if (execve(sleep_argv[0], sleep_argv, environ) < 0) err(-1, "%s", sleep_argv[0]); } else { if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); + if (pid != realpid) + errx(-1, "pdfork pid %d pdgetpid pid %d", realpid, + pid); if (fstat(fd, &sb) < 0) err(-1, "fstat"); if (sb.st_mode != (S_IFREG | S_IRWXU)) @@ -135,6 +147,9 @@ sleep(2); if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); + if (pid != realpid) + errx(-1, "pdfork pid %d pdgetpid pid %d", realpid, + pid); if (fstat(fd, &sb) < 0) err(-1, "fstat"); if (sb.st_mode != (S_IFREG | S_IRWXU)) @@ -145,6 +160,9 @@ sleep(1); if (pdgetpid(fd, &pid) < 0) err(-1, "pdgetpid"); + if (pid != realpid) + errx(-1, "pdfork pid %d pdgetpid pid %d", realpid, + pid); if (fstat(fd, &sb) < 0) err(-1, "fstat"); if (sb.st_mode != S_IFREG)