Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 3AAFC431FAF for ; Thu, 19 Jan 2012 02:32:31 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pOTx5xtNI6xP for ; Thu, 19 Jan 2012 02:32:30 -0800 (PST) Received: from mail-gw3.nixu.fi (mail-gw3.nixu.fi [193.209.237.7]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 5EE63431FAE for ; Thu, 19 Jan 2012 02:32:30 -0800 (PST) Received: from pps.filterd (mail-gw3 [127.0.0.1]) by mail-gw3.nixu.fi (8.14.4/8.14.4) with SMTP id q0JAJDFI019186; Thu, 19 Jan 2012 12:32:23 +0200 Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31]) by mail-gw3.nixu.fi with ESMTP id 114cs19sj4-1 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Thu, 19 Jan 2012 12:32:23 +0200 Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31]) by taco2.nixu.fi (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id q0JAWLNI026732; Thu, 19 Jan 2012 12:32:23 +0200 From: Tomi Ollila To: David Edmondson , Subject: Re: [PATCH 2/3] test: Add `test_emacs_expect_t'. In-Reply-To: References: <87pqei327k.fsf@gmail.com> <1326809224-22673-1-git-send-email-dme@dme.org> <1326809224-22673-2-git-send-email-dme@dme.org> User-Agent: Notmuch/0.11+71~gefa5d6c (http://notmuchmail.org) Emacs/23.3.1 (i686-pc-linux-gnu) X-Face: HhBM'cA~ MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.6.7361, 1.0.211, 0.0.0000 definitions=2012-01-19_05:2012-01-19, 2012-01-19, 1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 ipscore=0 suspectscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=6.0.2-1012030000 definitions=main-1201190034 X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jan 2012 10:32:31 -0000 On Thu, 19 Jan 2012 09:59:16 +0000, David Edmondson wrote: > On Wed, 18 Jan 2012 16:55:59 +0200, Tomi Ollila wrote: > > > + # Report success/failure. > > > + if ! test_skip "$test_subtest_name" > > > + then > > > + if [ "$result" == t ] > > > > if [ "$result" = t ] > > > > to be compatible with POSIX and consistent with rest code. > > I'm happy to change this. As your older patch has been marked obsolete and this really is the only place where there is == in comparison code please do that change. > > > + test_failure_ "$test_subtest_name" "$(eval printf ${result})" > > > > This added 'eval' made me investigate further... running > > > > emacsclient --eval '(print (concat "a" "b" "\t" "c" "\n" "z"))' > > > > outputs "ab c\nz" (tab between 'ab' and 'c', quotes (") around > > the whole output and newlines as "\n" (even '\r' is converted)). > > > > If emacs tests run via test_emacs_expect_t wrote their output > > to ${output} directly above code could be much cleaner in many > > places. Environment variable could be used for the file name. > > I'm reluctant to change this just to avoid calling eval. Consider the following: $ emacsclient --eval '(print "$(echo rm -rf /); echo `date +%Y`")' "$(echo rm -rf /); echo `date +%Y`" x='"$(echo rm -rf /); echo `date +%Y`"' $echo $x "$(echo rm -rf /); echo `date +%Y`" $echo $(eval printf $x) rm -rf /; echo 2012 x='"$(echo rm /); echo `date +%Y`"' $(eval printf $x) rm: cannot remove `/;': No such file or directory rm: cannot remove `2012': No such file or directory one just needs to make sure there is no $:s and `: in the output... hmm, nor ';' ...NOR '&':s ... I am not absolutely sure this might actually happen but surely I'm not sure it would not... ... The suggestion having environment variable would now work, but what about test_emacs "(setq test-output-file \"${output}\") $1" Tomi PS: this needs to be changed: emacsclient --socket-name="$EMACS_SERVER" --eval "(progn $@)" to emacsclient --socket-name="$EMACS_SERVER" --eval "(progn $*)" then test_emacs "(setq test-output-file \"${output}\")" "$1" would be safe