unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [PATCH 2/2] test/new: replace use of gdb in vanishing file test
Date: Sun, 24 Oct 2021 22:15:15 -0300	[thread overview]
Message-ID: <20211025011515.2533779-3-david@tethera.net> (raw)
In-Reply-To: <20211025011515.2533779-1-david@tethera.net>

Because the file to be removed has a predictable name, we can hard
code it in the generated shim.
---
 test/T050-new.sh    | 44 ++++++++++++++++++++++++--------------------
 test/notmuch-test.h |  1 +
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/test/T050-new.sh b/test/T050-new.sh
index 1141c1e3..5a03998b 100755
--- a/test/T050-new.sh
+++ b/test/T050-new.sh
@@ -368,31 +368,35 @@ chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.*
 test_expect_equal "$output" "A Xapian exception occurred opening database"
 
 
+make_shim dif-shim<<EOF
+#include <notmuch-test.h>
+notmuch_status_t
+notmuch_database_index_file (notmuch_database_t *database,
+			     const char *filename,
+			     notmuch_indexopts_t *indexopts,
+			     notmuch_message_t **message)
+{
+  static notmuch_status_t (*orig_notmuch_database_index_file)
+    (notmuch_database_t *database,
+     const char *filename,
+     notmuch_indexopts_t *indexopts,
+     notmuch_message_t **message) = NULL;
+  TEST_SAVE_ORIG(notmuch_database_index_file);
+
+  if (unlink("${MAIL_DIR}/vanish")) {
+     fprintf(stderr, "unlink failed\n");
+     exit(42);
+  }
+  return orig_notmuch_database_index_file(database, filename, indexopts, message);
+}
+EOF
+
 test_begin_subtest "Handle files vanishing between scandir and add_file"
 
 # A file for scandir to find. It won't get indexed, so can be empty.
 touch ${MAIL_DIR}/vanish
-
-# Breakpoint to remove the file before indexing
-cat <<EOF > notmuch-new-vanish.gdb
-set breakpoint pending on
-set logging file notmuch-new-vanish-gdb.log
-set logging on
-break notmuch_database_index_file
-commands
-shell rm -f ${MAIL_DIR}/vanish
-continue
-end
-run
-EOF
-
-${TEST_GDB} --batch-silent --return-child-result -x notmuch-new-vanish.gdb \
-    --args notmuch new 2>OUTPUT 1>/dev/null
+notmuch_with_shim dif-shim new 2>OUTPUT 1>/dev/null
 echo "exit status: $?" >> OUTPUT
-
-# Clean up the file in case gdb isn't available.
-rm -f ${MAIL_DIR}/vanish
-
 cat <<EOF > EXPECTED
 Unexpected error with file ${MAIL_DIR}/vanish
 add_file: Something went wrong trying to read or write a file
diff --git a/test/notmuch-test.h b/test/notmuch-test.h
index 8613a299..94348d69 100644
--- a/test/notmuch-test.h
+++ b/test/notmuch-test.h
@@ -7,6 +7,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 inline static void
 expect0 (int line, notmuch_status_t ret)
-- 
2.33.0

  parent reply	other threads:[~2021-10-25  1:15 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-25  1:15 Reduce test suite reliance on gdb David Bremner
2021-10-25  1:15 ` [PATCH 1/2] test/count: replace use of gdb with a LD_PRELOAD shim David Bremner
2021-10-25 19:04   ` Tomi Ollila
2021-10-25  1:15 ` David Bremner [this message]
2021-10-25 19:14   ` [PATCH 2/2] test/new: replace use of gdb in vanishing file test Tomi Ollila
2021-10-28 13:46     ` [PATCH v2 1/3] test: move system includes to notmuch-test.h David Bremner
2021-10-28 13:46       ` [PATCH v2 2/3] test/count: replace use of gdb with a LD_PRELOAD shim David Bremner
2021-10-28 13:46       ` [PATCH v2 3/3] test/new: replace use of gdb in vanishing file test David Bremner
2021-10-28 13:50         ` David Bremner
2021-12-04 16:51       ` [PATCH v2 1/3] test: move system includes to notmuch-test.h 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=20211025011515.2533779-3-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).