From owner-freebsd-testing@FreeBSD.ORG Mon Oct 28 01:31:41 2013 Return-Path: Delivered-To: freebsd-testing@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 77F71F58 for ; Mon, 28 Oct 2013 01:31:41 +0000 (UTC) (envelope-from julio@meroh.net) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com [209.85.217.171]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DA0DF2910 for ; Mon, 28 Oct 2013 01:31:40 +0000 (UTC) Received: by mail-lb0-f171.google.com with SMTP id x18so2385143lbi.30 for ; Sun, 27 Oct 2013 18:31:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type; bh=1lPF2dKvq1vwUT5d/cPUCAa+DJlpqtteqJ4SU287m1A=; b=DskZ9ihDrIZAP3ac5RQPHOVl8vSguXAw+P3+BWgJ2jS4uoOWmW2+I45IaVT2oqKxsx SVRQHzRNzH0BwRKmzvZh0oO1dyJ6rgWROWFbUs9iJsffn6EfVZtg/fOUL0AP8wGw0uLL bDHgpYuLLnlZlQx84/ZAuxgV9RGWtPOpzAJDupX/7fkN5IOM69Wr4GJCnFYkJ3OM+ib1 j2fVOwA9PDkPy2qV9qHbJXemZDSTeFfsXMu92/tkVz6jfhMvyICpo2TZ3MEIiVn5RhR0 Qn3nKcxCdq0nSPGoVjIwSp7kJ758gY9PbIBtYLMtWRkXENYhthz6qOqvBm3Uot8aNxZe plVA== X-Gm-Message-State: ALoCoQl217lTSUFdBRSOjoGMbcPDtWUaZgcALjXgNkI2Wbak6GYtZVmNm0HUP45OPjKi/95r/cUA X-Received: by 10.112.136.65 with SMTP id py1mr5892191lbb.4.1382923892094; Sun, 27 Oct 2013 18:31:32 -0700 (PDT) MIME-Version: 1.0 Received: by 10.112.132.135 with HTTP; Sun, 27 Oct 2013 18:31:12 -0700 (PDT) X-Originating-IP: [108.176.158.82] In-Reply-To: References: From: Julio Merino Date: Sun, 27 Oct 2013 21:31:12 -0400 Message-ID: Subject: Re: Plugging ATF tests into the build and other cleanups To: Eitan Adler Content-Type: text/plain; charset=ISO-8859-1 Cc: freebsd-testing@freebsd.org, Rui Paulo , Simon Gerraty X-BeenThere: freebsd-testing@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Testing on FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Oct 2013 01:31:41 -0000 On Sun, Oct 27, 2013 at 8:25 PM, Eitan Adler wrote: > On Sun, Oct 27, 2013 at 6:12 PM, Julio Merino wrote: >> Hello! >> The one concern I have here is having to keep track of all tests in >> tools/build/mk/OptionalObsoleteFiles.inc so that setting >> WITHOUT_TESTS=no cleans up /usr/tests. This will be a pain to maintain >> and a sure source of inconsistencies. If we could special-case this to >> make it more automatic, do you have any suggestions? > > Is it possible to use the list of current tests and just delete any > files which are not listed? I think what you are suggesting applies to src/ObsoleteFiles.inc, not tools/build/mk/OptionalObsoleteFiles.inc? For deleted tests, I think using src/ObsoleteFiles.inc is fine as usual. Deleted tests have to be removed no matter what the value of MK_TESTS is. If that list gets out of hand at some point we could revisit this, although I'm not sure how you can easily determine the list of "current tests". AFAIK there is no list in src detailing all files that are expected to be installed? My concern is only about the latter at the moment. When MK_TESTS=no, /usr/tests should not exist at all and, therefore, a "make delete-old-files" should wipe it. We can do this as usual, with the functionality in tools/build/mk/OptionalObsoleteFiles.inc to record all files to be deleted, or we can do something different to avoid maintaining the list by hand. A simple "rm -rf ${DESTDIR}/usr/tests" would suffice, but I'm just wondering if that'd be an acceptable thing to do. > We would need some way to have "local" tests but that should not be difficult? You mean tests from ports and/or for manually installed software? Those should all be somewhere in /usr/local/ and we can easily hook them into the test suite. (Hadn't thought about these, but it's easy.) -- Julio Merino / @jmmv