From a1e649276e181bbb2f14594628333d4337e3fc7c Mon Sep 17 00:00:00 2001 From: Luis Ressel Date: Mon, 11 Mar 2019 18:14:48 +0100 Subject: [PATCH] test/T030-config: Separate stdout and stderr output POSIX doesn't specify the flushing behaviour of the STDOUT stream, so it's invalid to assume a particular order between the stdout and stderr output. The current test breaks on musl due to this. --- test/T030-config.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/T030-config.sh b/test/T030-config.sh index f36695c6..eba2e0e7 100755 --- a/test/T030-config.sh +++ b/test/T030-config.sh @@ -43,7 +43,8 @@ notmuch config set foo.nonexistent test_expect_equal "$(notmuch config get foo.nonexistent)" "" test_begin_subtest "List all items" -notmuch config list 2>&1 | notmuch_config_sanitize > OUTPUT +notmuch config list > STDOUT 2> STDERR +printf "%s\n====\n%s\n" "$(< STDOUT)" "$(< STDERR)" | notmuch_config_sanitize > OUTPUT if [ "${NOTMUCH_GMIME_MAJOR}" -lt 3 ]; then config_gpg_path="crypto.gpg_path=gpg @@ -51,7 +52,6 @@ if [ "${NOTMUCH_GMIME_MAJOR}" -lt 3 ]; then fi cat < EXPECTED -Error opening database at MAIL_DIR/.notmuch: No such file or directory database.path=MAIL_DIR user.name=Notmuch Test Suite user.primary_email=test_suite@notmuchmail.org @@ -65,6 +65,8 @@ foo.list=this;is another;list value; built_with.compact=something built_with.field_processor=something built_with.retry_lock=something +==== +Error opening database at MAIL_DIR/.notmuch: No such file or directory EOF test_expect_equal_file EXPECTED OUTPUT