From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: phillip.lord@russet.org.uk (Phillip Lord) Newsgroups: gmane.emacs.devel Subject: Re: Merging Org tests Date: Tue, 14 Feb 2017 18:13:57 +0000 Message-ID: <87lgt8myhm.fsf@russet.org.uk> References: <871sv0oljt.fsf@gmx.us> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1487096269 3013 195.159.176.226 (14 Feb 2017 18:17:49 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 14 Feb 2017 18:17:49 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.91 (gnu/linux) Cc: emacs-devel@gnu.org To: Rasmus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Feb 14 19:17:44 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cdhfZ-0000DG-CZ for ged-emacs-devel@m.gmane.org; Tue, 14 Feb 2017 19:17:41 +0100 Original-Received: from localhost ([::1]:36470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdhfe-0001We-OC for ged-emacs-devel@m.gmane.org; Tue, 14 Feb 2017 13:17:46 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdhc6-0006nE-Un for emacs-devel@gnu.org; Tue, 14 Feb 2017 13:14:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdhc3-0001HO-0j for emacs-devel@gnu.org; Tue, 14 Feb 2017 13:14:06 -0500 Original-Received: from mailgw.mycpanelcloud.co.uk ([185.116.214.205]:20948) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cdhc2-0001Gx-Jd for emacs-devel@gnu.org; Tue, 14 Feb 2017 13:14:02 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by mailgw.mycpanelcloud.co.uk (Postfix) with ESMTP id 45798C66CB for ; Tue, 14 Feb 2017 18:13:34 +0000 (GMT) X-Virus-Scanned: by SpamTitan at mycpanelcloud.co.uk Original-Received: from mailgw.mycpanelcloud.co.uk (localhost [127.0.0.1]) by mailgw.mycpanelcloud.co.uk (Postfix) with ESMTP id 38B20C65F3 for ; Tue, 14 Feb 2017 18:13:33 +0000 (GMT) Original-Received: from cloud103.planethippo.com (cloud103.planethippo.com [31.216.48.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mailgw.mycpanelcloud.co.uk (Postfix) with ESMTPS id 3128EC65B1 for ; Tue, 14 Feb 2017 18:13:33 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=russet.org.uk; s=default; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=0NrPXJnP6NlhRZZC6jBrLbSOSfw7unjYxWM/tVqLrrU=; b=c+LiXPQpLIzaVW1+Hnwkl6bwt nf3fNjj8N5FBuhGvN8CKAbUfRQubBajXKO49xDthBZZvZAkII6a/3zLmTqq+Gr2IHBdUTrEH0F34w ocaBb3IYSHivjPw0KLH9GevPdiDZ+Ay9S1NpcxFBRaIVihZHNPY66Dzb+/YemHDURMQ9CmqqWRTSm jlQKiqetYypBN5D+b/bYy8FJhjk534FofcRDO3ANaApmltBw5AHRDkbzr8vJCg9UWtu24PxfKKNik AfQqmtnMoFVeU/87iB58vx4R28Cigv8avrrvh1BhhwJeXIeTHKuTNCglgkYd89gUJb+7pw3/Q+CGq OOGrj3Bjg==; Original-Received: from janus-nat-128-240-225-37.ncl.ac.uk ([128.240.225.37]:34588 helo=russet.org.uk) by cloud103.planethippo.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.87) (envelope-from ) id 1cdhby-0009TE-By; Tue, 14 Feb 2017 18:13:58 +0000 In-Reply-To: <871sv0oljt.fsf@gmx.us> (rasmus@gmx.us's message of "Tue, 14 Feb 2017 16:10:30 +0100") X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud103.planethippo.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - russet.org.uk X-Get-Message-Sender-Via: cloud103.planethippo.com: authenticated_id: phillip.lord@russet.org.uk X-Authenticated-Sender: cloud103.planethippo.com: phillip.lord@russet.org.uk X-detected-operating-system: by eggs.gnu.org: FreeBSD 8.x [fuzzy] X-Received-From: 185.116.214.205 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:212381 Archived-At: Rasmus writes: > I'm starting to prepare the merger of Org 9+ to Emacs master. I have not > followed the entire recent Emacs+ELPA discussion in the other thread. > > I understand that it would be desirable to include the Org tests in Emacs. > > The readme/file-organization file in the "test" dir of emacs.git is a bit > confusing. Apologies, my fault. > Why does it talk about an "automated" folder that isn't there? I > guess it's simply "lisp" folder. Yeah, that was the original idea, but we ended up with src, lisp and manual > Also, how strictly must the suggested file organization be followed? > Skimming "make-test-deps.emacs-lisp" it seems it might have to be followed > rather strictly. It depends what you want. make-test-deps.emacs-lisp is there so that "make check-maybe" can work sanely to run (some approximation of) just those tests that need running. I thought this was a good thing to have, because "make check" takes too long to run in a commit hook. If you don't follow the file organisation, then make check will still work. > In Org, tests are already organized into a different file hierarchy > and use a slightly different naming scheme. > > Here's the Org "testing" folder: > > http://orgmode.org/cgit.cgi/org-mode.git/tree/testing > > The main differences are: > > - In Emacs "test" ressources are in a parallel folder alongside lisp, in > the Org repo they are stored in a sibling folder to the one with the > tests. This is a consequence of Emacs' monolithic layout. I think your layout is better and core should adopt your layout, but that's a slightly different issue. > - In the Org repo, tests are prefixed with "test-", in Emacs "test" they > should have a "-tests" suffix. I picked "tests" over "test" on the basis of popularity, IIRC. > - The Org tests depend on the library "org-test.el", though I guess that > is not really an issue. > > What would be the best strategy for including the Org tests in the Emacs > repo? > > 1. Include Org tests in the "manual" folder and keep the current structure. > 2. Start to reorganize the tests in the Org repo to follow the Emacs > scheme. > 3. Keep tests in the Org repo. Really be good to get tests in into main, so not 3. That's the main thing. Phil