Received: from eggs.gnu.org ([2001:4830:134:3::10]:55013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zujo4-0007Ui-NT for qemu-devel@nongnu.org; Fri, 06 Nov 2015 11:24:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zujny-00028w-S0 for qemu-devel@nongnu.org; Fri, 06 Nov 2015 11:24:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47023) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zujny-00028s-NS for qemu-devel@nongnu.org; Fri, 06 Nov 2015 11:23:58 -0500 From: Markus Armbruster References: <1446791754-23823-1-git-send-email-eblake@redhat.com> <1446791754-23823-8-git-send-email-eblake@redhat.com> <871tc316gn.fsf@blackfin.pond.sub.org> <563CCE4F.6060809@redhat.com> Date: Fri, 06 Nov 2015 17:23:55 +0100 In-Reply-To: <563CCE4F.6060809@redhat.com> (Eric Blake's message of "Fri, 6 Nov 2015 08:59:11 -0700") Message-ID: <87fv0jw0ys.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH v10 07/30] qapi: Simplify error cleanup in test-qmp-* List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: qemu-devel@nongnu.org, Michael Roth Eric Blake writes: > On 11/06/2015 08:40 AM, Markus Armbruster wrote: >> Eric Blake writes: >> >>> By moving err into data, we can let test teardown take care >>> of cleaning up any collected error; it also gives us fewer >>> lines of code between repeated tests where init runs teardown >>> on our behalf. >> >> I think this paragraph is no longer valid: you aren't moving err >> anywhere in this version. > > D'oh. I scrubbed the code, but not the commit message. At least it was > a faithful split of the v9 version of the commit, before I reworked the > mechanism :) > > How about: > > We have several tests that perform multiple sub-actions that are > expected to fail. Asserting that an error occurred, then clearing it up > to prepare for the next action, turned into enough boilerplate that it > was sometimes forgotten, If you got suitable commit SHAs handy, lets insert some here. > risking memory leak or invalidating the efforts > of the second action (passing a non-NULL err into a function is > generally a bad idea). Encapsulate the boilerplate into a single helper > function error_free_or_abort(), and consistently use it. Works for me. >>> Rather than duplicate code between .c files, I added a new >>> test-qmp-common.h. I debated about putting >>> error_free_or_abort() in error.h, but it seems like something >>> that is only useful for tests. >> >> Maybe, maybe not. I'd accept it into error.h. > > Do you want me to post a fixup patch that relocates it into error.h? I guess the result would be slightly simpler, so go ahead. >>> Signed-off-by: Eric Blake >> >> Patch looks okay.