diff options
| author | David Bremner <david@tethera.net> | 2021-10-27 22:09:03 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-10-27 22:09:03 -0300 |
| commit | e7528f9b77cb90a01502e1ad7491be71c59ba32a (patch) | |
| tree | 23236541b25997c421c102df9a3189f2f1a0d3d7 | |
| parent | 93104f0d9de4fa2919896a55dfdd207bbaf22589 (diff) | |
| parent | d6e4ca6a7a3a1a18eee7be3aa5fb8d0987e0894d (diff) | |
Merge branch 'release'
| -rw-r--r-- | NEWS | 2 | ||||
| -rwxr-xr-x | test/T590-libconfig.sh | 14 |
2 files changed, 8 insertions, 8 deletions
@@ -7,7 +7,7 @@ General An optional new s-expression based query parser is available if notmuch is built with the `sfsexp` library. See notmuch-sexp-queries(7) for syntax, and use `notmuch config get -built_with.sexpr_queries` to check if notmuch is compiled with +built_with.sexpr_query` to check if notmuch is compiled with s-expression query support. CLI diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh index 59b82a6f..a9566c13 100755 --- a/test/T590-libconfig.sh +++ b/test/T590-libconfig.sh @@ -461,7 +461,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL% } EOF rm -f ${ovconfig} -NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} +export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} cat <<'EOF' >EXPECTED == stdout == test.key1 = overridden-home @@ -488,7 +488,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL% } EOF rm -f ${ovconfig} -NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} +export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} cat <<'EOF' >EXPECTED == stdout == test.key1 = overridden-xdg @@ -515,7 +515,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% work } EOF rm -f ${ovconfig} -NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} +export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} cat <<'EOF' >EXPECTED == stdout == test.key1 = overridden-xdg-profile @@ -541,7 +541,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% work } EOF #rm -f ${ovconfig} -NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} +export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} cat <<'EOF' >EXPECTED == stdout == test.key1 = overridden-profile @@ -559,7 +559,7 @@ cat c_head - c_tail <<'EOF' | test_C %NULL% '' %NULL% printf("NOT RUN"); } EOF -NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} +export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} cat <<'EOF' >EXPECTED == stdout == == stderr == @@ -604,7 +604,7 @@ cat c_head - c_tail <<'EOF' | test_C %NULL% '' %NULL% printf("test.key2 = %s\n", val); } EOF -NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} +export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} unset NOTMUCH_DATABASE cat <<'EOF' >EXPECTED == stdout == @@ -783,7 +783,7 @@ cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} %NULL% %NULL% } EOF rm -f ${ovconfig} -NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} +export NOTMUCH_CONFIG=${old_NOTMUCH_CONFIG} cat <<'EOF' >EXPECTED == stdout == test.key1 = overridden-home |