[PATCH 1/2] test/config: add tests for built_with

[PATCH 1/2] test/config: add tests for built_with

[David Bremner]

The "get" test is known broken because this functionality was dropped
during the 0.32 config rewrite.
---
 test/T030-config.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/test/T030-config.sh b/test/T030-config.sh
index 751feaf3..3c1955bb 100755
--- a/test/T030-config.sh
+++ b/test/T030-config.sh
@@ -145,4 +145,23 @@ notmuch config set --database ${key} ${value}
 output=$(notmuch config get ${key})
 test_expect_equal "${output}" "${value}"
 
+test_begin_subtest "set built_with.* yields error"
+test_expect_code 1 "notmuch config set built_with.compact false"
+
+test_begin_subtest "get built_with.{compact,field_processor} prints true"
+test_subtest_known_broken
+for key in compact field_processor; do
+    notmuch config get built_with.${key}
+done > OUTPUT
+cat <<EOF > EXPECTED
+true
+true
+EOF
+test_expect_equal_file EXPECTED OUTPUT
+
+test_begin_subtest "get built_with.nonexistent prints false"
+test_subtest_known_broken
+output=$(notmuch config get built_with.nonexistent)
+test_expect_equal "$output" "false"
+
 test_done
-- 
2.30.2

[PATCH 2/2] CLI/config: restore "notmuch config get built_with.*"

[David Bremner]

We need to special case the config section "built_with" because it is
not (currently) handled by the library. This seems consist with the
other sub-sub-commands 'list' and 'set'.
---
 notmuch-config.c    | 17 ++++++++++++-----
 test/T030-config.sh |  2 --
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/notmuch-config.c b/notmuch-config.c
index 3430a3d3..4de55e5f 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -538,11 +538,18 @@ notmuch_config_command_get (notmuch_database_t *notmuch, char *item)
 {
     notmuch_config_values_t *list;
 
-    for (list = notmuch_config_get_values_string (notmuch, item);
-	 notmuch_config_values_valid (list);
-	 notmuch_config_values_move_to_next (list)) {
-	const char *val = notmuch_config_values_get (list);
-	puts (val);
+    if (STRNCMP_LITERAL (item, BUILT_WITH_PREFIX) == 0) {
+	if (notmuch_built_with (item + strlen (BUILT_WITH_PREFIX)))
+	    puts ("true");
+	else
+	    puts ("false");
+    } else {
+	for (list = notmuch_config_get_values_string (notmuch, item);
+	     notmuch_config_values_valid (list);
+	     notmuch_config_values_move_to_next (list)) {
+	    const char *val = notmuch_config_values_get (list);
+	    puts (val);
+	}
     }
     return EXIT_SUCCESS;
 }
diff --git a/test/T030-config.sh b/test/T030-config.sh
index 3c1955bb..636c6356 100755
--- a/test/T030-config.sh
+++ b/test/T030-config.sh
@@ -149,7 +149,6 @@ test_begin_subtest "set built_with.* yields error"
 test_expect_code 1 "notmuch config set built_with.compact false"
 
 test_begin_subtest "get built_with.{compact,field_processor} prints true"
-test_subtest_known_broken
 for key in compact field_processor; do
     notmuch config get built_with.${key}
 done > OUTPUT
@@ -160,7 +159,6 @@ EOF
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "get built_with.nonexistent prints false"
-test_subtest_known_broken
 output=$(notmuch config get built_with.nonexistent)
 test_expect_equal "$output" "false"
 
-- 
2.30.2