From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [RFC PATCH v2 05/12] perf-test: allow running test_emacs from performance test suite.
Date: Thu, 3 Feb 2022 10:32:47 -0400 [thread overview]
Message-ID: <20220203143254.3344753-6-david@tethera.net> (raw)
In-Reply-To: <20220203143254.3344753-1-david@tethera.net>
test_require_external prereq has to move to test-lib-common.sh, and
the new shell functions print_emacs_header and time_emacs are provided.
The somewhat indirect way of printing the output is to avoid the extra
"" present on string values from emacsclient.
---
performance-test/perf-test-lib.sh | 5 +++++
test/test-lib-common.sh | 14 ++++++++++++++
test/test-lib-emacs.sh | 8 ++++++++
test/test-lib.el | 5 +++++
test/test-lib.sh | 14 --------------
5 files changed, 32 insertions(+), 14 deletions(-)
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-emacs.sh b/test/test-lib-emacs.sh
index a298526d..ad4c4aeb 100644
--- a/test/test-lib-emacs.sh
+++ b/test/test-lib-emacs.sh
@@ -207,4 +207,12 @@ test_emacs () {
${TEST_EMACSCLIENT} --socket-name="$EMACS_SERVER" --eval "(notmuch-test-progn $*)"
}
+time_emacs () {
+ rm -f MESSAGES
+ printf "%s" "$1"
+ shift
+ test_emacs "(test-time $*)" > emacs.out
+ tail -n 1 MESSAGES
+}
+
emacs_generate_script
diff --git a/test/test-lib.el b/test/test-lib.el
index adabda4a..1b5e8549 100644
--- a/test/test-lib.el
+++ b/test/test-lib.el
@@ -188,6 +188,11 @@ running, quit if it terminated."
(with-current-buffer (get-buffer-create "*Notmuch errors*")
(test-output "ERRORS"))))
+(defmacro test-time (&rest body)
+ `(let ((results (mapcar (lambda (x) (/ x 5.0)) (benchmark-run 5 ,@body))))
+ (message "\t\t%0.2f\t%0.2f\t%0.2f" (nth 0 results) (nth 1 results) (nth 2 results))
+ (with-current-buffer "*Messages*" (test-output "MESSAGES"))))
+
;; 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
next prev parent reply other threads:[~2022-02-03 14:34 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-03 14:32 v3 support undo in emacs frontend David Bremner
2022-02-03 14:32 ` [RFC PATCH v2 01/12] doc/emacs: add minimal documentation for notmuch-unthreaded mode David Bremner
2022-02-03 14:32 ` [RFC PATCH v2 02/12] test: split variable settings to their own file David Bremner
2022-02-03 14:32 ` [RFC PATCH v2 03/12] test/emacs: split out emacs related tests David Bremner
2022-02-03 14:32 ` [RFC PATCH v2 04/12] test/emacs: write *Notmuch errors* buffer from test macro David Bremner
2022-02-03 14:32 ` David Bremner [this message]
2022-02-03 14:32 ` [RFC PATCH v2 06/12] perf-test: emacs tagging David Bremner
2022-02-03 14:32 ` [RFC PATCH v2 07/12] emacs: remove non-batch code path from function notmuch-tag David Bremner
2022-02-03 14:32 ` [RFC PATCH v2 08/12] emacs/tag: keep tag history David Bremner
2022-02-03 14:32 ` [RFC PATCH v2 09/12] emacs: add notmuch-tag-undo David Bremner
2022-02-03 19:09 ` Miguel Bernabeu
2022-02-03 21:57 ` David Bremner
2022-02-03 14:32 ` [RFC PATCH v2 10/12] emacs: redirect undo to notmuch-tag-undo David Bremner
2022-02-03 14:32 ` [RFC PATCH v2 11/12] emacs: Document undo binding David Bremner
2022-02-03 14:32 ` [RFC PATCH v2 12/12] emacs: whitespace cleanup for keybindings David Bremner
2022-02-04 12:35 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220203143254.3344753-6-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).