Re: [Patch v3 03/11] lib/cli: add library API / CLI for compile time options

diff --git a/74/9d0e7e5a7174d2a47aa4ea9c5ceac3c147ebe6 b/74/9d0e7e5a7174d2a47aa4ea9c5ceac3c147ebe6
new file mode 100644 (file)
index 0000000..06144ae
--- /dev/null
+++ b/74/9d0e7e5a7174d2a47aa4ea9c5ceac3c147ebe6
@@ -0,0 +1,136 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id D99576DE0217\r
+ for <notmuch@notmuchmail.org>; Sat,  7 May 2016 09:03:05 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.601\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.601 tagged_above=-999 required=5 tests=[AWL=-0.051,\r
+  SPF_NEUTRAL=0.652] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id wprfQveglX6y for <notmuch@notmuchmail.org>;\r
+ Sat,  7 May 2016 09:02:57 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 856216DE00EB\r
+ for <notmuch@notmuchmail.org>; Sat,  7 May 2016 09:02:57 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id C501F100063;\r
+ Sat,  7 May 2016 19:02:51 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [Patch v3 03/11] lib/cli: add library API / CLI for compile time\r
+ options\r
+In-Reply-To: <1462065879-29860-4-git-send-email-david@tethera.net>\r
+References: <1462065879-29860-1-git-send-email-david@tethera.net>\r
+ <1462065879-29860-4-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.22+9~gb26b5ad (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sat, 07 May 2016 19:02:51 +0300\r
+Message-ID: <m237ptg8k4.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 07 May 2016 16:03:06 -0000\r
+\r
+On Sun, May 01 2016, David Bremner <david@tethera.net> wrote:\r
+\r
+so far so good, (CXXLAGS does not need more mentioning ;)\r
+\r
+> diff --git a/test/T030-config.sh b/test/T030-config.sh\r
+> index f404908..a4e24c3 100755\r
+> --- a/test/T030-config.sh\r
+> +++ b/test/T030-config.sh\r
+> @@ -44,7 +44,7 @@ test_expect_equal "$(notmuch config get foo.nonexistent)" ""\r
+>  \r
+>  test_begin_subtest "List all items"\r
+>  notmuch config set database.path "/canonical/path"\r
+> -output=$(notmuch config list)\r
+> +output=$(notmuch config list | notmuch_options_sanitize)\r
+\r
+notmuch_built_with_sanitize ? ------/\\r
+\r
+>  test_expect_equal "$output" "\\r
+>  database.path=/canonical/path\r
+>  user.name=Notmuch Test Suite\r
+> @@ -56,7 +56,9 @@ search.exclude_tags=\r
+>  maildir.synchronize_flags=true\r
+>  crypto.gpg_path=gpg\r
+>  foo.string=this is another string value\r
+> -foo.list=this;is another;list value;"\r
+> +foo.list=this;is another;list value;\r
+> +built_with.compact=something\r
+> +built_with.field_processor=something"\r
+>  \r
+>  test_begin_subtest "Top level --config=FILE option"\r
+>  cp "${NOTMUCH_CONFIG}" alt-config\r
+> diff --git a/test/T040-setup.sh b/test/T040-setup.sh\r
+> index cf0c00b..be2f0db 100755\r
+> --- a/test/T040-setup.sh\r
+> +++ b/test/T040-setup.sh\r
+> @@ -19,7 +19,7 @@ another.suite@example.com\r
+>  foo bar\r
+>  baz\r
+>  EOF\r
+> -output=$(notmuch --config=new-notmuch-config config list)\r
+> +output=$(notmuch --config=new-notmuch-config config list | notmuch_built_with_sanitize)\r
+>  test_expect_equal "$output" "\\r
+>  database.path=/path/to/maildir\r
+>  user.name=Test Suite\r
+> @@ -29,6 +29,8 @@ new.tags=foo;bar;\r
+>  new.ignore=\r
+>  search.exclude_tags=baz;\r
+>  maildir.synchronize_flags=true\r
+> -crypto.gpg_path=gpg"\r
+> +crypto.gpg_path=gpg\r
+> +built_with.compact=something\r
+> +built_with.field_processor=something"\r
+>  \r
+>  test_done\r
+> diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+> index ac04b15..09f8731 100644\r
+> --- a/test/test-lib.sh\r
+> +++ b/test/test-lib.sh\r
+> @@ -733,6 +733,12 @@ notmuch_uuid_sanitize ()\r
+>  {\r
+>      sed 's/[0-9a-f]\{8\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{12\}/UUID/g'\r
+>  }\r
+> +\r
+> +notmuch_built_with_sanitize ()\r
+> +{\r
+> +    sed 's/^built_with[.]\(.*\)=.*$/built_with.\1=something/'\r
+> +}\r
+\r
+The above looks good. In this case I think this would work too\r
+\r
+    sed '/^built_with/ s/=.*/=something/'\r
+\r
+hmm. simpler, but less educational ;)\r
+\r
+\r
+Tomi\r
+\r
+\r
+> +\r
+>  # End of notmuch helper functions\r
+>  \r
+>  # Use test_set_prereq to tell that a particular prerequisite is available.\r
+> -- \r
+> 2.8.0.rc3\r