From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <notmuch-bounces@notmuchmail.org>
Received: from mp12.migadu.com ([2001:41d0:8:6d80::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms0.migadu.com with LMTPS
	id 2E6ND5CZ9WFRLQAAgWs5BA
	(envelope-from <notmuch-bounces@notmuchmail.org>)
	for <larch@yhetil.org>; Sat, 29 Jan 2022 20:46:24 +0100
Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp12.migadu.com with LMTPS
	id CFI1DJCZ9WGZBgEAauVa8A
	(envelope-from <notmuch-bounces@notmuchmail.org>)
	for <larch@yhetil.org>; Sat, 29 Jan 2022 20:46:24 +0100
Received: from mail.notmuchmail.org (yantan.tethera.net [135.181.149.255])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
	(No client certificate requested)
	by aspmx1.migadu.com (Postfix) with ESMTPS id C938C39DDA
	for <larch@yhetil.org>; Sat, 29 Jan 2022 20:46:23 +0100 (CET)
Received: from yantan.tethera.net (localhost [127.0.0.1])
	by mail.notmuchmail.org (Postfix) with ESMTP id 2A5175F75E;
	Sat, 29 Jan 2022 19:45:52 +0000 (UTC)
Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1])
	by mail.notmuchmail.org (Postfix) with ESMTP id 07E835F752
	for <notmuch@notmuchmail.org>; Sat, 29 Jan 2022 19:45:50 +0000 (UTC)
Received: by fethera.tethera.net (Postfix, from userid 1001)
	id CE8055FC01; Sat, 29 Jan 2022 14:45:48 -0500 (EST)
Received: (nullmailer pid 2790872 invoked by uid 1000);
	Sat, 29 Jan 2022 19:45:39 -0000
From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [RFC PATCH v2 3/8] WIP enable running test_emacs from performance tests
Date: Sat, 29 Jan 2022 15:44:35 -0400
Message-Id: <20220129194439.2790761-4-david@tethera.net>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20220129194439.2790761-1-david@tethera.net>
References: <20220129194439.2790761-1-david@tethera.net>
MIME-Version: 1.0
Message-ID-Hash: X4A3TJF4KVMCH7KDBDAHDLJXHBPMEE2X
X-Message-ID-Hash: X4A3TJF4KVMCH7KDBDAHDLJXHBPMEE2X
X-MailFrom: bremner@tethera.net
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header
X-Mailman-Version: 3.3.3
Precedence: list
List-Id: "Use and development of the notmuch mail system." <notmuch.notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Owner: <mailto:notmuch-owner@notmuchmail.org>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Subscribe: <mailto:notmuch-join@notmuchmail.org>
List-Unsubscribe: <mailto:notmuch-leave@notmuchmail.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
X-Migadu-Flow: FLOW_IN
X-Migadu-Country: DE
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1643485583;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references:list-id:list-help:
	 list-owner:list-unsubscribe:list-subscribe:list-post;
	bh=SzZiJAjYdYhV14FI1or19KO+DWD/zvcvErIfjCfUT8I=;
	b=rKBxAutHgXtKF7geR8nAi+b5To2uvPOsT6EEs6PtPqJivHnm3gH9LEoaBOgwDx6dgrB+el
	JhDliuZPHh4gEFemngYmOfYMRQ9I+ARw0EbE9sR0BuzkMCcAxDTvnZA638yZLOrgSkzStj
	cdZjjhjdUkVp+HfhL2y4l3X5+WrR+aSenYpLY1tCzsPESYGT3zr4fs3C+k/Hmgom3tBC1h
	a059tch4Dj/lmqalRreA251VxtSqSIfnNyfxDqneTdjGrGCwkyBeLdI7g55CiAHk46ywwr
	YtZ3CAX5Bz1j22sV9jS4j599GFHxwFIbiMwaRseHmesVL5k1KHS/02XkRNf34g==
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1643485583; a=rsa-sha256; cv=none;
	b=moUT6dj3I9XU9zV8bZWMJ/nU6sNa+Ckhi0DOwYcX+yvBRNFHQxXcVffw/V1wNeWUpNxN3O
	HnqyZHUfs8O21FqIFS4XBg5tO/nO8OK3WMuMTwTX+0TjRF8vLoIRfcCBICEchu7vmpU/XI
	hulkdgo8+L135fZ5slgWj4YqZL16ZrdvJCUT0a4uAnY2B4JiBy0YUh4SxJbH3dqDt/ouJC
	18l5WIDYY6rLA0GDcupwi0YLpiZNBNJvU4yz4Jrbwn9r0UehBb5Z2KhjYRL8prPcqZCrG7
	BPLHnLC5VedZKyFTvXj1DfkiXSamHT6iA4nhuFGwdb7uIkPc2XXFUKmnrpGIPw==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=none;
	dmarc=none;
	spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org
X-Migadu-Spam-Score: -1.36
Authentication-Results: aspmx1.migadu.com;
	dkim=none;
	dmarc=none;
	spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org
X-Migadu-Queue-Id: C938C39DDA
X-Spam-Score: -1.36
X-Migadu-Scanner: scn1.migadu.com
X-TUID: wUCwjm+YTvux

The extra "" around the time output is a bit annoying, but maybe not
worth blocking on.
---
 configure                         |  3 +++
 performance-test/perf-test-lib.sh |  5 +++++
 test/test-lib-common.sh           | 14 ++++++++++++++
 test/test-lib.el                  |  4 ++++
 test/test-lib.sh                  | 14 --------------
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index 36f3f606..9097cee7 100755
--- a/configure
+++ b/configure
@@ -1551,6 +1551,9 @@ cat > sh.config <<EOF
 
 NOTMUCH_SRCDIR='${NOTMUCH_SRCDIR}'
 
+# Emacs exists, and notmuch was configured with it.
+NOTMUCH_WITH_EMACS=${WITH_EMACS}
+
 # Whether to have Xapian retry lock
 NOTMUCH_HAVE_XAPIAN_DB_RETRY_LOCK=${WITH_RETRY_LOCK}
 
diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh
index 0e4915e3..c34f8cd6 100644
--- a/performance-test/perf-test-lib.sh
+++ b/performance-test/perf-test-lib.sh
@@ -210,6 +210,11 @@ print_header ()
     printf "\t\t\tWall(s)\tUsr(s)\tSys(s)\tRes(K)\tIn/Out(512B)\n"
 }
 
+print_emacs_header ()
+{
+    printf "\t\t\tWall(s)\tGCs\tGC time(s)\n"
+}
+
 time_run ()
 {
     printf "  %-22s" "$1"
diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh
index ebbf4cdf..18fa29c0 100644
--- a/test/test-lib-common.sh
+++ b/test/test-lib-common.sh
@@ -29,6 +29,20 @@ if [[ -z "$NOTMUCH_SRCDIR" ]] || [[ -z "$NOTMUCH_BUILDDIR" ]]; then
 	exit 1
 fi
 
+# Explicitly require external prerequisite.  Useful when binary is
+# called indirectly (e.g. from emacs).
+# Returns success if dependency is available, failure otherwise.
+test_require_external_prereq () {
+	local binary
+	binary="$1"
+	if [[ ${test_missing_external_prereq_["${binary}"]} == t ]]; then
+		# dependency is missing, call the replacement function to note it
+		eval "$binary"
+	else
+		true
+	fi
+}
+
 backup_database () {
     test_name=$(basename $0 .sh)
     rm -rf $TMP_DIRECTORY/notmuch-dir-backup."$test_name"
diff --git a/test/test-lib.el b/test/test-lib.el
index 6831b46f..755081ed 100644
--- a/test/test-lib.el
+++ b/test/test-lib.el
@@ -186,6 +186,10 @@ running, quit if it terminated."
        (t (message "%s" err)))
      (with-current-buffer "*Messages*" (test-output "MESSAGES"))))
 
+(defmacro test-time (title &rest body)
+  `(let ((results (mapcar (lambda (x) (/ x 5.0)) (benchmark-run 5 ,@body))))
+     (format "%s\t\t%0.2f\t%0.2f\t%0.2f" ,title (nth 0 results) (nth 1 results) (nth 2 results))))
+
 ;; For historical reasons, we hide deleted tags by default in the test
 ;; suite
 (setq notmuch-tag-deleted-formats
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 89e5c6d8..59b6079d 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -603,20 +603,6 @@ $binary () {
 	fi
 }
 
-# Explicitly require external prerequisite.  Useful when binary is
-# called indirectly (e.g. from emacs).
-# Returns success if dependency is available, failure otherwise.
-test_require_external_prereq () {
-	local binary
-	binary="$1"
-	if [[ ${test_missing_external_prereq_["${binary}"]} == t ]]; then
-		# dependency is missing, call the replacement function to note it
-		eval "$binary"
-	else
-		true
-	fi
-}
-
 # You are not expected to call test_ok_ and test_failure_ directly, use
 # the text_expect_* functions instead.
 
-- 
2.34.1