From owner-svn-src-head@freebsd.org Thu Feb 23 04:28:57 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3891ECE9D43; Thu, 23 Feb 2017 04:28:57 +0000 (UTC) (envelope-from badger@FreeBSD.org) Received: from sasl.smtp.pobox.com (pb-smtp2.pobox.com [64.147.108.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 108231589; Thu, 23 Feb 2017 04:28:56 +0000 (UTC) (envelope-from badger@FreeBSD.org) Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id CA9BC69E3E; Wed, 22 Feb 2017 23:28:54 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=subject:to :references:from:message-id:date:mime-version:in-reply-to :content-type:content-transfer-encoding; s=sasl; bh=5QztrU8rAcVt MHvL29AzvO0t0JE=; b=IMig30ANdrDwZEK0aToewvFihSIJzBs3U4inb+y1YH4g nu7beuPzwmRHCoPw2lhB/hOOE989vY+vWFmZErj/Ebwy7MByzNRsD1Bkv4WSroQs Hv6Y8k66MSDkA+dh7MsESsQve4L1NuWTg+FSKHXAGgiygy3mWGnZOuURu0YjEKY= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id C212C69E3D; Wed, 22 Feb 2017 23:28:54 -0500 (EST) Received: from [192.168.1.103] (unknown [24.7.205.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id 1208E69E37; Wed, 22 Feb 2017 23:28:54 -0500 (EST) Subject: Re: svn commit: r314075 - head/tests/sys/kern To: Ian Lepore , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201702220435.v1M4Z8iT059727@repo.freebsd.org> <1487822752.25520.2.camel@freebsd.org> From: Eric Badger Message-ID: Date: Wed, 22 Feb 2017 22:28:53 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <1487822752.25520.2.camel@freebsd.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Pobox-Relay-ID: 959EF064-F980-11E6-B67E-A7617B1B28F4-46178211!pb-smtp2.pobox.com X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2017 04:28:57 -0000 On 02/22/2017 10:05 PM, Ian Lepore wrote: > On Wed, 2017-02-22 at 04:35 +0000, Eric Badger wrote: >> Author: badger >> Date: Wed Feb 22 04:35:07 2017 >> New Revision: 314075 >> URL: https://svnweb.freebsd.org/changeset/base/314075 >> >> Log: >> Fix world build for archs where __builtin_debugtrap() does not >> work. >> >> The offending code was introduced in r313992. >> >> Reported by: rpokala >> Approved by: kib (mentor) >> >> Modified: >> head/tests/sys/kern/ptrace_test.c >> >> Modified: head/tests/sys/kern/ptrace_test.c >> ===================================================================== >> ========= >> --- head/tests/sys/kern/ptrace_test.c Wed Feb 22 04:28:10 2017 >> (r314074) >> +++ head/tests/sys/kern/ptrace_test.c Wed Feb 22 04:35:07 2017 >> (r314075) >> @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); >> #include >> #include >> #include >> +#include >> #include >> #include >> #include >> @@ -1690,7 +1691,7 @@ ATF_TC_BODY(ptrace__PT_KILL_breakpoint, >> ATF_REQUIRE((fpid = fork()) != -1); >> if (fpid == 0) { >> trace_me(); >> - __builtin_debugtrap(); >> + breakpoint(); >> exit(1); >> } >> >> > > This fixes only x86 and sparc64. All other arches have breakpoint() > under the #ifdef KERNEL wrapper (I have no idea why). If fixing this > is going to take any longer, can we disconnect this test from the build > until it gets worked out? > > -- Ian > Yes, that was my error. In my haste to fix things, I misread the headers and thought I had breakpoint() everywhere (and only tested sparc64/amd64). Sorry about that. It should be fixed in r314118. Eric