(no subject)

[David Bremner]

The first of these fixes a build failure on Debian Linux/armhf (and
OS/X). If the patch seems ok, I'd like to roll it into a bug fix
release.  The second is more of a suggestion to make that atomicity
test easier to debug, since it seems to find the dark corners of gdb.

[PATCH 1/2] test: allow pending break points in atomicity script.

[David Bremner]

This seems to fix problems with the symbol rename not being defined
at startup on at least OS/X and some Debian Linux architectures.
---
 test/atomicity.gdb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/atomicity.gdb b/test/atomicity.gdb
index fd67525..15adb16 100644
--- a/test/atomicity.gdb
+++ b/test/atomicity.gdb
@@ -18,6 +18,10 @@ shell echo 0 > outcount
 
 shell touch inodes
 
+# work around apparent issue with lazy library loading on some
+# platforms
+set breakpoint pending on
+
 break rename
 commands
 # As an optimization, only consider snapshots after a Xapian commit.
-- 
1.9.2

[PATCH 2/2] test: redirect gdb output to a file.

[David Bremner]

It seems that the normal output redirection in the test suite doesn't
work for gdb, but it's nice to have output in a file for debugging.
---
 test/T380-atomicity.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/T380-atomicity.sh b/test/T380-atomicity.sh
index 1c786fa..2daef90 100755
--- a/test/T380-atomicity.sh
+++ b/test/T380-atomicity.sh
@@ -64,7 +64,7 @@ if test_require_external_prereq gdb; then
     # -tty /dev/null works around a conflict between the 'timeout' wrapper
     # and gdb's attempt to control the TTY.
     export MAIL_DIR
-    gdb -tty /dev/null -batch -x $TEST_DIRECTORY/atomicity.gdb notmuch >/dev/null 2>/dev/null
+    gdb -tty /dev/null -batch -x $TEST_DIRECTORY/atomicity.gdb notmuch 1>gdb.out 2>&1
 
     # Get the final, golden output
     notmuch search '*' > expected
-- 
1.9.2

Re:

[Jameson Graef Rollins]

[-- Attachment #1: Type: text/plain, Size: 498 bytes --]

On Tue, May 06 2014, David Bremner <david@tethera.net> wrote:
> The first of these fixes a build failure on Debian Linux/armhf (and
> OS/X). If the patch seems ok, I'd like to roll it into a bug fix
> release.  The second is more of a suggestion to make that atomicity
> test easier to debug, since it seems to find the dark corners of gdb.

Hey, David.  It looks like Charles's series fixes some of these same
issues and more:

id:1399395748-44920-1-git-send-email-cceleri@cs.stanford.edu

jamie.

[-- Attachment #2: Type: application/pgp-signature, Size: 818 bytes --]

Re:

[Tomi Ollila]

On Tue, May 06 2014, David Bremner <david@tethera.net> wrote:

> The first of these fixes a build failure on Debian Linux/armhf (and
> OS/X). If the patch seems ok, I'd like to roll it into a bug fix
> release.  The second is more of a suggestion to make that atomicity
> test easier to debug, since it seems to find the dark corners of gdb.

Series LGTM.

Tomi

Re: [PATCH 1/2] test: allow pending break points in atomicity script.

[David Bremner]

David Bremner <david@tethera.net> writes:

> This seems to fix problems with the symbol rename not being defined
> at startup on at least OS/X and some Debian Linux architectures.

pushed to release and master.

d

Re: [PATCH 2/2] test: redirect gdb output to a file.

[David Bremner]

David Bremner <david@tethera.net> writes:

> It seems that the normal output redirection in the test suite doesn't
> work for gdb, but it's nice to have output in a file for debugging.

pushed,

d