From owner-freebsd-testing@FreeBSD.ORG Thu Mar 6 17:43:13 2014 Return-Path: Delivered-To: freebsd-testing@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D552363B for ; Thu, 6 Mar 2014 17:43:13 +0000 (UTC) Received: from mail-qc0-f169.google.com (mail-qc0-f169.google.com [209.85.216.169]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 94EA1269 for ; Thu, 6 Mar 2014 17:43:13 +0000 (UTC) Received: by mail-qc0-f169.google.com with SMTP id i17so3321082qcy.14 for ; Thu, 06 Mar 2014 09:43:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-type; bh=viWFKh4Rz9iwvbxAcONd7pAjQuI58BBsDmkrLcHKWOI=; b=MpKbVT7Ua/TMBRZpwSNfAJlkCJ8/C+Kz2gbfldZWvEa4kdN4F8bM8fOVjA4xaw426F QUm5NL3DkVxMeCwodz3WyjVJyF6zsxeczbTHC52+Ul9owlnTtwbru8ypvIklRnC/LxcY BcafOSPFMmI61SMnkhG0RyG8yCZ/9Ui8OYkyI1iAuhvAsWqKmd+66jdG5po6b4oNINyf EMoQHm/T8s2DNzKqyw+hv/oZFHKBGDSwxnmTStX/dOSt3urIMoNWvC90Zbf5Mcx9rU9Q 2C0gcrzaZc/Dw+PBFvnldU3B2gqZtwNjy6gPB8myYNvRx/YZcmntK0p6DlHHEmy74Gx6 dmJQ== X-Gm-Message-State: ALoCoQnn7MC7CR7aKtALoEi3uT04/CAeZPWYzihjZJqBmpGUTC8qBUZqsyAdrBoNgZA5hwZaWeug X-Received: by 10.229.84.198 with SMTP id k6mr9381530qcl.20.1394127456062; Thu, 06 Mar 2014 09:37:36 -0800 (PST) MIME-Version: 1.0 Sender: jmmv@meroh.net Received: by 10.96.83.102 with HTTP; Thu, 6 Mar 2014 09:37:15 -0800 (PST) X-Originating-IP: [2620:0:1003:1021:5c49:13a2:f7c6:9920] In-Reply-To: <43135FE5-5A9D-4AD5-B65F-E6FC20B9E366@gmail.com> References: <43135FE5-5A9D-4AD5-B65F-E6FC20B9E366@gmail.com> From: Julio Merino Date: Thu, 6 Mar 2014 12:37:15 -0500 X-Google-Sender-Auth: eBAtRA-z2T071p9jwVLqPQjiw2I Message-ID: Subject: Re: Should we MFC tests into stable/10? To: Garrett Cooper Content-Type: text/plain; charset=ISO-8859-1 Cc: "freebsd-testing@freebsd.org" X-BeenThere: freebsd-testing@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Testing on FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 17:43:13 -0000 On Thu, Mar 6, 2014 at 10:01 AM, Garrett Cooper wrote: > >> On Mar 6, 2014, at 6:26, Julio Merino wrote: >> >> Hello all, >> >> Keeping the testing infrastructure in sync between current and >> stable/10 is, in my opinion, a worthy goal. For that reason, I have >> (finally) pulled up a bunch of related pending changes into the branch >> today and will continue to do so for upcoming improvements. >> >> However, I would like to gather your opinion on what to do about the >> tests themselves. >> >> Do you think it's worth keeping the tests between current and >> stable/10 in sync wherever possible? Because we have barely just >> started adding tests, this will certainly involve quite a bit of churn >> in MFCs -- but that's probably not a big deal. The tricky^Winteresting >> cases will come when tests start failing in only one of the two >> branches :-P >> >> My opinion is now leaning towards merging everything where it makes >> sense. What's yours? > > You're probably going to run into similar problems that devs run into when MFCing code. > > It depends on whether or not the tests require a specific piece of build/test infrastructure, and whether or not the tests exercise a new feature or fix/change behavior. > > The former case is trickier as there will be breaking points for things in the future, but the latter case is pretty straightforward (devs should be merging tests back with code changes for new features/behavior). > > I vote yes for stable/10 now, but I would be wary of future merges as head and stable/(head-1) diverge, and similarly stable/(head-2). Yeah, that's a reasonable point. However, I'd expect the churn to slow down post-11. If that happens, then MFCing tests will be a case-by-case call. stable/10 is special in this regard.