From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id CD3726DE0FB6 for ; Sun, 11 Sep 2016 09:05:30 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.584 X-Spam-Level: X-Spam-Status: No, score=-0.584 tagged_above=-999 required=5 tests=[AWL=0.136, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id p_dYmCXx7rEs for ; Sun, 11 Sep 2016 09:05:30 -0700 (PDT) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by arlo.cworth.org (Postfix) with ESMTPS id 8C3186DE0FA5 for ; Sun, 11 Sep 2016 09:05:29 -0700 (PDT) Received: by mail-wm0-f66.google.com with SMTP id b187so10196281wme.0 for ; Sun, 11 Sep 2016 09:05:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nikula-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=jwO62pV9KtixxltIe8i6Nz7QM7kFYXMj5p2fRx7DlH8=; b=P/eobfrSe8QBXSoT7oL0MvjsN6Wwguy+1q/Umdqu6+xRFUkGn4udO9SiQhw83dxDZK Jjvf8Jfa3ebRnFctBALQ32QTR8tG/pyQtm//YyWbvQdX9v3XpX0sJF6WsStjP4a3khvQ Gz8fDejygQ5maqlkv+9zpUD1v4iewzUV0GSBP9krUhgT9fv8yvHz5F/5Nl9CCWy9oZ+H Fl+tzxtI8IAWI5IQhjqW7RSjRDEhwqsGETZv/awALrlHJSBr6+x0T8Vrli/3iXzQ5Vnc M/lUwgPPFFg3M/pWR5XbT9ARejl5/ApcDMIavHhogMPtJvseKRKosDRl+pXZxPDd9X6w H1xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=jwO62pV9KtixxltIe8i6Nz7QM7kFYXMj5p2fRx7DlH8=; b=l6PP5K4CdR00SF0eAIedTTR2w2Avz1BCK4T355zGqlfdvr2+8WzbKDzVKbGxcMzaUa BWed/F16nGAmHr857ySA7J4AqOkAM2UtFUqtdQ/tRg0AnMtKpBkdVR/gFM9U0sn6ArnG kBR1o4C27qxva/0f1UgA3k9fcx5ouRmQg4hCLInfMcC7yDOBxJGY1tu6NySscXodbiKX HckLiMV8zJKKcafobYiw7Tuz809GWTBZawHiHod300e0Qb5RAS83+8/rTILdTVo9JirD 0fDfY7tLJpZ6BpM4Mz47FEUKzY6b4CjAtjCF/Gat5qvP6s3IRXznEm5VvckiW0iZajbu qVQg== X-Gm-Message-State: AE9vXwMdkm6R6AADuTQ6BExZDIqEhk39ITHJEi7mfa9wmCbA42ExEio6UhiVWDiZZsj+6g== X-Received: by 10.194.161.197 with SMTP id xu5mr13339102wjb.88.1473609927574; Sun, 11 Sep 2016 09:05:27 -0700 (PDT) Received: from localhost (mobile-access-bcee6a-45.dhcp.inet.fi. [188.238.106.45]) by smtp.gmail.com with ESMTPSA id pm1sm13472015wjb.40.2016.09.11.09.05.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Sep 2016 09:05:26 -0700 (PDT) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH] test: make it possible to have multiple corpora Date: Sun, 11 Sep 2016 19:03:44 +0300 Message-Id: <1473609824-6258-1-git-send-email-jani@nikula.org> X-Mailer: git-send-email 2.1.4 X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.22 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: Sun, 11 Sep 2016 16:05:30 -0000 We largely use the corpus under test/corpus for testing. Unfortunately, many of our tests have grown to depend on having exactly this set of messages, making it hard to add new message files for testing specific cases. Move the basic corpus under tests/corpora/default, and make it possible to add new, independent corpora along its side. This means tons of renames with a few tweaks to add_email_corpus function in test-lib.sh to let tests specify which corpus to use. --- This is to address id:87pooc1t4s.fsf@zancas.localnet --- test/{corpus => corpora/default}/01:2, | 0 test/{corpus => corpora/default}/02:2, | 0 test/{corpus => corpora/default}/bar/17:2, | 0 test/{corpus => corpora/default}/bar/18:2, | 0 test/{corpus => corpora/default}/bar/baz/05:2, | 0 test/{corpus => corpora/default}/bar/baz/23:2, | 0 test/{corpus => corpora/default}/bar/baz/24:2, | 0 test/{corpus => corpora/default}/bar/baz/cur/25:2, | 0 test/{corpus => corpora/default}/bar/baz/cur/26:2, | 0 test/{corpus => corpora/default}/bar/baz/new/27:2, | 0 test/{corpus => corpora/default}/bar/baz/new/28:2, | 0 test/{corpus => corpora/default}/bar/cur/19:2, | 0 test/{corpus => corpora/default}/bar/cur/20:2, | 0 test/{corpus => corpora/default}/bar/new/21:2, | 0 test/{corpus => corpora/default}/bar/new/22:2, | 0 test/{corpus => corpora/default}/cur/29:2, | 0 test/{corpus => corpora/default}/cur/30:2, | 0 test/{corpus => corpora/default}/cur/31:2, | 0 test/{corpus => corpora/default}/cur/32:2, | 0 test/{corpus => corpora/default}/cur/33:2, | 0 test/{corpus => corpora/default}/cur/34:2, | 0 test/{corpus => corpora/default}/cur/35:2, | 0 test/{corpus => corpora/default}/cur/36:2, | 0 test/{corpus => corpora/default}/cur/37:2, | 0 test/{corpus => corpora/default}/cur/38:2, | 0 test/{corpus => corpora/default}/cur/39:2, | 0 test/{corpus => corpora/default}/cur/40:2, | 0 test/{corpus => corpora/default}/cur/41:2, | 0 test/{corpus => corpora/default}/cur/42:2, | 0 test/{corpus => corpora/default}/cur/43:2, | 0 test/{corpus => corpora/default}/cur/44:2, | 0 test/{corpus => corpora/default}/cur/45:2, | 0 test/{corpus => corpora/default}/cur/46:2, | 0 test/{corpus => corpora/default}/cur/47:2, | 0 test/{corpus => corpora/default}/cur/48:2, | 0 test/{corpus => corpora/default}/cur/49:2, | 0 test/{corpus => corpora/default}/cur/50:2, | 0 test/{corpus => corpora/default}/cur/51:2, | 0 test/{corpus => corpora/default}/cur/52:2, | 0 test/{corpus => corpora/default}/cur/53:2, | 0 test/{corpus => corpora/default}/foo/06:2, | 0 test/{corpus => corpora/default}/foo/baz/11:2, | 0 test/{corpus => corpora/default}/foo/baz/12:2, | 0 test/{corpus => corpora/default}/foo/baz/cur/13:2, | 0 test/{corpus => corpora/default}/foo/baz/cur/14:2, | 0 test/{corpus => corpora/default}/foo/baz/new/15:2, | 0 test/{corpus => corpora/default}/foo/baz/new/16:2, | 0 test/{corpus => corpora/default}/foo/cur/07:2, | 0 test/{corpus => corpora/default}/foo/cur/08:2, | 0 test/{corpus => corpora/default}/foo/new/03:2, | 0 test/{corpus => corpora/default}/foo/new/09:2, | 0 test/{corpus => corpora/default}/foo/new/10:2, | 0 test/{corpus => corpora/default}/new/04:2, | 0 test/test-lib.sh | 19 ++++++++++++------- 54 files changed, 12 insertions(+), 7 deletions(-) rename test/{corpus => corpora/default}/01:2, (100%) rename test/{corpus => corpora/default}/02:2, (100%) rename test/{corpus => corpora/default}/bar/17:2, (100%) rename test/{corpus => corpora/default}/bar/18:2, (100%) rename test/{corpus => corpora/default}/bar/baz/05:2, (100%) rename test/{corpus => corpora/default}/bar/baz/23:2, (100%) rename test/{corpus => corpora/default}/bar/baz/24:2, (100%) rename test/{corpus => corpora/default}/bar/baz/cur/25:2, (100%) rename test/{corpus => corpora/default}/bar/baz/cur/26:2, (100%) rename test/{corpus => corpora/default}/bar/baz/new/27:2, (100%) rename test/{corpus => corpora/default}/bar/baz/new/28:2, (100%) rename test/{corpus => corpora/default}/bar/cur/19:2, (100%) rename test/{corpus => corpora/default}/bar/cur/20:2, (100%) rename test/{corpus => corpora/default}/bar/new/21:2, (100%) rename test/{corpus => corpora/default}/bar/new/22:2, (100%) rename test/{corpus => corpora/default}/cur/29:2, (100%) rename test/{corpus => corpora/default}/cur/30:2, (100%) rename test/{corpus => corpora/default}/cur/31:2, (100%) rename test/{corpus => corpora/default}/cur/32:2, (100%) rename test/{corpus => corpora/default}/cur/33:2, (100%) rename test/{corpus => corpora/default}/cur/34:2, (100%) rename test/{corpus => corpora/default}/cur/35:2, (100%) rename test/{corpus => corpora/default}/cur/36:2, (100%) rename test/{corpus => corpora/default}/cur/37:2, (100%) rename test/{corpus => corpora/default}/cur/38:2, (100%) rename test/{corpus => corpora/default}/cur/39:2, (100%) rename test/{corpus => corpora/default}/cur/40:2, (100%) rename test/{corpus => corpora/default}/cur/41:2, (100%) rename test/{corpus => corpora/default}/cur/42:2, (100%) rename test/{corpus => corpora/default}/cur/43:2, (100%) rename test/{corpus => corpora/default}/cur/44:2, (100%) rename test/{corpus => corpora/default}/cur/45:2, (100%) rename test/{corpus => corpora/default}/cur/46:2, (100%) rename test/{corpus => corpora/default}/cur/47:2, (100%) rename test/{corpus => corpora/default}/cur/48:2, (100%) rename test/{corpus => corpora/default}/cur/49:2, (100%) rename test/{corpus => corpora/default}/cur/50:2, (100%) rename test/{corpus => corpora/default}/cur/51:2, (100%) rename test/{corpus => corpora/default}/cur/52:2, (100%) rename test/{corpus => corpora/default}/cur/53:2, (100%) rename test/{corpus => corpora/default}/foo/06:2, (100%) rename test/{corpus => corpora/default}/foo/baz/11:2, (100%) rename test/{corpus => corpora/default}/foo/baz/12:2, (100%) rename test/{corpus => corpora/default}/foo/baz/cur/13:2, (100%) rename test/{corpus => corpora/default}/foo/baz/cur/14:2, (100%) rename test/{corpus => corpora/default}/foo/baz/new/15:2, (100%) rename test/{corpus => corpora/default}/foo/baz/new/16:2, (100%) rename test/{corpus => corpora/default}/foo/cur/07:2, (100%) rename test/{corpus => corpora/default}/foo/cur/08:2, (100%) rename test/{corpus => corpora/default}/foo/new/03:2, (100%) rename test/{corpus => corpora/default}/foo/new/09:2, (100%) rename test/{corpus => corpora/default}/foo/new/10:2, (100%) rename test/{corpus => corpora/default}/new/04:2, (100%) diff --git a/test/corpus/01:2, b/test/corpora/default/01:2, similarity index 100% rename from test/corpus/01:2, rename to test/corpora/default/01:2, diff --git a/test/corpus/02:2, b/test/corpora/default/02:2, similarity index 100% rename from test/corpus/02:2, rename to test/corpora/default/02:2, diff --git a/test/corpus/bar/17:2, b/test/corpora/default/bar/17:2, similarity index 100% rename from test/corpus/bar/17:2, rename to test/corpora/default/bar/17:2, diff --git a/test/corpus/bar/18:2, b/test/corpora/default/bar/18:2, similarity index 100% rename from test/corpus/bar/18:2, rename to test/corpora/default/bar/18:2, diff --git a/test/corpus/bar/baz/05:2, b/test/corpora/default/bar/baz/05:2, similarity index 100% rename from test/corpus/bar/baz/05:2, rename to test/corpora/default/bar/baz/05:2, diff --git a/test/corpus/bar/baz/23:2, b/test/corpora/default/bar/baz/23:2, similarity index 100% rename from test/corpus/bar/baz/23:2, rename to test/corpora/default/bar/baz/23:2, diff --git a/test/corpus/bar/baz/24:2, b/test/corpora/default/bar/baz/24:2, similarity index 100% rename from test/corpus/bar/baz/24:2, rename to test/corpora/default/bar/baz/24:2, diff --git a/test/corpus/bar/baz/cur/25:2, b/test/corpora/default/bar/baz/cur/25:2, similarity index 100% rename from test/corpus/bar/baz/cur/25:2, rename to test/corpora/default/bar/baz/cur/25:2, diff --git a/test/corpus/bar/baz/cur/26:2, b/test/corpora/default/bar/baz/cur/26:2, similarity index 100% rename from test/corpus/bar/baz/cur/26:2, rename to test/corpora/default/bar/baz/cur/26:2, diff --git a/test/corpus/bar/baz/new/27:2, b/test/corpora/default/bar/baz/new/27:2, similarity index 100% rename from test/corpus/bar/baz/new/27:2, rename to test/corpora/default/bar/baz/new/27:2, diff --git a/test/corpus/bar/baz/new/28:2, b/test/corpora/default/bar/baz/new/28:2, similarity index 100% rename from test/corpus/bar/baz/new/28:2, rename to test/corpora/default/bar/baz/new/28:2, diff --git a/test/corpus/bar/cur/19:2, b/test/corpora/default/bar/cur/19:2, similarity index 100% rename from test/corpus/bar/cur/19:2, rename to test/corpora/default/bar/cur/19:2, diff --git a/test/corpus/bar/cur/20:2, b/test/corpora/default/bar/cur/20:2, similarity index 100% rename from test/corpus/bar/cur/20:2, rename to test/corpora/default/bar/cur/20:2, diff --git a/test/corpus/bar/new/21:2, b/test/corpora/default/bar/new/21:2, similarity index 100% rename from test/corpus/bar/new/21:2, rename to test/corpora/default/bar/new/21:2, diff --git a/test/corpus/bar/new/22:2, b/test/corpora/default/bar/new/22:2, similarity index 100% rename from test/corpus/bar/new/22:2, rename to test/corpora/default/bar/new/22:2, diff --git a/test/corpus/cur/29:2, b/test/corpora/default/cur/29:2, similarity index 100% rename from test/corpus/cur/29:2, rename to test/corpora/default/cur/29:2, diff --git a/test/corpus/cur/30:2, b/test/corpora/default/cur/30:2, similarity index 100% rename from test/corpus/cur/30:2, rename to test/corpora/default/cur/30:2, diff --git a/test/corpus/cur/31:2, b/test/corpora/default/cur/31:2, similarity index 100% rename from test/corpus/cur/31:2, rename to test/corpora/default/cur/31:2, diff --git a/test/corpus/cur/32:2, b/test/corpora/default/cur/32:2, similarity index 100% rename from test/corpus/cur/32:2, rename to test/corpora/default/cur/32:2, diff --git a/test/corpus/cur/33:2, b/test/corpora/default/cur/33:2, similarity index 100% rename from test/corpus/cur/33:2, rename to test/corpora/default/cur/33:2, diff --git a/test/corpus/cur/34:2, b/test/corpora/default/cur/34:2, similarity index 100% rename from test/corpus/cur/34:2, rename to test/corpora/default/cur/34:2, diff --git a/test/corpus/cur/35:2, b/test/corpora/default/cur/35:2, similarity index 100% rename from test/corpus/cur/35:2, rename to test/corpora/default/cur/35:2, diff --git a/test/corpus/cur/36:2, b/test/corpora/default/cur/36:2, similarity index 100% rename from test/corpus/cur/36:2, rename to test/corpora/default/cur/36:2, diff --git a/test/corpus/cur/37:2, b/test/corpora/default/cur/37:2, similarity index 100% rename from test/corpus/cur/37:2, rename to test/corpora/default/cur/37:2, diff --git a/test/corpus/cur/38:2, b/test/corpora/default/cur/38:2, similarity index 100% rename from test/corpus/cur/38:2, rename to test/corpora/default/cur/38:2, diff --git a/test/corpus/cur/39:2, b/test/corpora/default/cur/39:2, similarity index 100% rename from test/corpus/cur/39:2, rename to test/corpora/default/cur/39:2, diff --git a/test/corpus/cur/40:2, b/test/corpora/default/cur/40:2, similarity index 100% rename from test/corpus/cur/40:2, rename to test/corpora/default/cur/40:2, diff --git a/test/corpus/cur/41:2, b/test/corpora/default/cur/41:2, similarity index 100% rename from test/corpus/cur/41:2, rename to test/corpora/default/cur/41:2, diff --git a/test/corpus/cur/42:2, b/test/corpora/default/cur/42:2, similarity index 100% rename from test/corpus/cur/42:2, rename to test/corpora/default/cur/42:2, diff --git a/test/corpus/cur/43:2, b/test/corpora/default/cur/43:2, similarity index 100% rename from test/corpus/cur/43:2, rename to test/corpora/default/cur/43:2, diff --git a/test/corpus/cur/44:2, b/test/corpora/default/cur/44:2, similarity index 100% rename from test/corpus/cur/44:2, rename to test/corpora/default/cur/44:2, diff --git a/test/corpus/cur/45:2, b/test/corpora/default/cur/45:2, similarity index 100% rename from test/corpus/cur/45:2, rename to test/corpora/default/cur/45:2, diff --git a/test/corpus/cur/46:2, b/test/corpora/default/cur/46:2, similarity index 100% rename from test/corpus/cur/46:2, rename to test/corpora/default/cur/46:2, diff --git a/test/corpus/cur/47:2, b/test/corpora/default/cur/47:2, similarity index 100% rename from test/corpus/cur/47:2, rename to test/corpora/default/cur/47:2, diff --git a/test/corpus/cur/48:2, b/test/corpora/default/cur/48:2, similarity index 100% rename from test/corpus/cur/48:2, rename to test/corpora/default/cur/48:2, diff --git a/test/corpus/cur/49:2, b/test/corpora/default/cur/49:2, similarity index 100% rename from test/corpus/cur/49:2, rename to test/corpora/default/cur/49:2, diff --git a/test/corpus/cur/50:2, b/test/corpora/default/cur/50:2, similarity index 100% rename from test/corpus/cur/50:2, rename to test/corpora/default/cur/50:2, diff --git a/test/corpus/cur/51:2, b/test/corpora/default/cur/51:2, similarity index 100% rename from test/corpus/cur/51:2, rename to test/corpora/default/cur/51:2, diff --git a/test/corpus/cur/52:2, b/test/corpora/default/cur/52:2, similarity index 100% rename from test/corpus/cur/52:2, rename to test/corpora/default/cur/52:2, diff --git a/test/corpus/cur/53:2, b/test/corpora/default/cur/53:2, similarity index 100% rename from test/corpus/cur/53:2, rename to test/corpora/default/cur/53:2, diff --git a/test/corpus/foo/06:2, b/test/corpora/default/foo/06:2, similarity index 100% rename from test/corpus/foo/06:2, rename to test/corpora/default/foo/06:2, diff --git a/test/corpus/foo/baz/11:2, b/test/corpora/default/foo/baz/11:2, similarity index 100% rename from test/corpus/foo/baz/11:2, rename to test/corpora/default/foo/baz/11:2, diff --git a/test/corpus/foo/baz/12:2, b/test/corpora/default/foo/baz/12:2, similarity index 100% rename from test/corpus/foo/baz/12:2, rename to test/corpora/default/foo/baz/12:2, diff --git a/test/corpus/foo/baz/cur/13:2, b/test/corpora/default/foo/baz/cur/13:2, similarity index 100% rename from test/corpus/foo/baz/cur/13:2, rename to test/corpora/default/foo/baz/cur/13:2, diff --git a/test/corpus/foo/baz/cur/14:2, b/test/corpora/default/foo/baz/cur/14:2, similarity index 100% rename from test/corpus/foo/baz/cur/14:2, rename to test/corpora/default/foo/baz/cur/14:2, diff --git a/test/corpus/foo/baz/new/15:2, b/test/corpora/default/foo/baz/new/15:2, similarity index 100% rename from test/corpus/foo/baz/new/15:2, rename to test/corpora/default/foo/baz/new/15:2, diff --git a/test/corpus/foo/baz/new/16:2, b/test/corpora/default/foo/baz/new/16:2, similarity index 100% rename from test/corpus/foo/baz/new/16:2, rename to test/corpora/default/foo/baz/new/16:2, diff --git a/test/corpus/foo/cur/07:2, b/test/corpora/default/foo/cur/07:2, similarity index 100% rename from test/corpus/foo/cur/07:2, rename to test/corpora/default/foo/cur/07:2, diff --git a/test/corpus/foo/cur/08:2, b/test/corpora/default/foo/cur/08:2, similarity index 100% rename from test/corpus/foo/cur/08:2, rename to test/corpora/default/foo/cur/08:2, diff --git a/test/corpus/foo/new/03:2, b/test/corpora/default/foo/new/03:2, similarity index 100% rename from test/corpus/foo/new/03:2, rename to test/corpora/default/foo/new/03:2, diff --git a/test/corpus/foo/new/09:2, b/test/corpora/default/foo/new/09:2, similarity index 100% rename from test/corpus/foo/new/09:2, rename to test/corpora/default/foo/new/09:2, diff --git a/test/corpus/foo/new/10:2, b/test/corpora/default/foo/new/10:2, similarity index 100% rename from test/corpus/foo/new/10:2, rename to test/corpora/default/foo/new/10:2, diff --git a/test/corpus/new/04:2, b/test/corpora/default/new/04:2, similarity index 100% rename from test/corpus/new/04:2, rename to test/corpora/default/new/04:2, diff --git a/test/test-lib.sh b/test/test-lib.sh index aac0343ba7bf..e2e26e6f274a 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -541,21 +541,26 @@ emacs_fcc_message () notmuch new >/dev/null } -# Generate a corpus of email and add it to the database. +# Add an existing, fixed corpus of email to the database. # -# This corpus is fixed, (it happens to be 50 messages from early in -# the history of the notmuch mailing list), which allows for reliably +# $1 is the corpus dir under corpora to add, using "default" if unset. +# +# The default corpus is based on about 50 messages from early in the +# history of the notmuch mailing list, which allows for reliably # testing commands that need to operate on a not-totally-trivial # number of messages. add_email_corpus () { + corpus=${1:-default} + rm -rf ${MAIL_DIR} - if [ -d $TEST_DIRECTORY/corpus.mail ]; then - cp -a $TEST_DIRECTORY/corpus.mail ${MAIL_DIR} + if [ -d $TEST_DIRECTORY/corpora.mail/$corpus ]; then + cp -a $TEST_DIRECTORY/corpora.mail/$corpus ${MAIL_DIR} else - cp -a $TEST_DIRECTORY/corpus ${MAIL_DIR} + cp -a $TEST_DIRECTORY/corpora/$corpus ${MAIL_DIR} notmuch new >/dev/null || die "'notmuch new' failed while adding email corpus" - cp -a ${MAIL_DIR} $TEST_DIRECTORY/corpus.mail + mkdir -p $TEST_DIRECTORY/corpora.mail + cp -a ${MAIL_DIR} $TEST_DIRECTORY/corpora.mail/$corpus fi } -- 2.1.4