From owner-freebsd-testing@FreeBSD.ORG Mon Oct 28 15:47:05 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 E85382CC for ; Mon, 28 Oct 2013 15:47:04 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-we0-x22f.google.com (mail-we0-x22f.google.com [IPv6:2a00:1450:400c:c03::22f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 838D5288B for ; Mon, 28 Oct 2013 15:47:04 +0000 (UTC) Received: by mail-we0-f175.google.com with SMTP id t61so6691859wes.20 for ; Mon, 28 Oct 2013 08:47:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=QgDALuQNBXpHcBVfbaIuIqLWrby8MC2eKHTMLviljpM=; b=UmP0Md920V7CgMx5OyEbckoR/UUGPzVXr7LfwigUD2O2rNCEkqjVq6DXTr0JL9kBtJ 9/91ABJmV7By8lmsKRZ1eNRdG+PBkrITrsqTb/AP7NeEO9v1I86HmuApMHu1wnmZQAdx eyO8iUlNvLbMwlzNbvfpyzSVsoBOaTirqev8g6ozKOJUrYC/cynm1mj24QdSIiEf2cc/ gAqAzQd02iwHsIWj+twS0fobmUXLWG0Vwi7JHTDB+Vv8O2bipBRrim4RPLS90vLzCfBx O3ZfGXIzMcYFITRLImv48pqYw7yT76+ZAcZKH2MWICDrtwB+bYGPcr7BfKUPBzPeLqrv Afcg== MIME-Version: 1.0 X-Received: by 10.180.198.44 with SMTP id iz12mr9648599wic.32.1382975222844; Mon, 28 Oct 2013 08:47:02 -0700 (PDT) Sender: asomers@gmail.com Received: by 10.194.171.35 with HTTP; Mon, 28 Oct 2013 08:47:02 -0700 (PDT) In-Reply-To: References: Date: Mon, 28 Oct 2013 09:47:02 -0600 X-Google-Sender-Auth: U8av5DktSQhZrgiNPUhElxwJKAE Message-ID: Subject: Re: Plugging ATF tests into the build and other cleanups From: Alan Somers To: Julio Merino 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 15:47:05 -0000 On Sun, Oct 27, 2013 at 7:31 PM, Julio Merino wrote: > 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.) On our custom version of FreeBSD, we have a few ports that install tests to /usr/local/tests, a top-level Kyuafile at both /usr/tests/Kyuafile and /usr/local/tests/Kyuafile, and a symlink from /usr/tests/local -> /usr/local/tests. It works well. > > -- > Julio Merino / @jmmv > _______________________________________________ > freebsd-testing@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-testing > To unsubscribe, send any mail to "freebsd-testing-unsubscribe@freebsd.org"