From: Tomi Ollila Date: Wed, 25 Mar 2015 16:09:29 +0000 (+0200) Subject: Re: [Patch v5 2/8] test: add support for compiling and running C snippets X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=54af6b479d7ac626785b73d4af9b0765bf34e53b;p=notmuch-archives.git Re: [Patch v5 2/8] test: add support for compiling and running C snippets --- diff --git a/4f/041d8e27f510dd22aa2d882b23443ceb9f01ff b/4f/041d8e27f510dd22aa2d882b23443ceb9f01ff new file mode 100644 index 000000000..6db6e9d18 --- /dev/null +++ b/4f/041d8e27f510dd22aa2d882b23443ceb9f01ff @@ -0,0 +1,117 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 5D893431FC0 + for ; Wed, 25 Mar 2015 09:10:01 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 2.438 +X-Spam-Level: ** +X-Spam-Status: No, score=2.438 tagged_above=-999 required=5 + tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id TDHL3s65GBhl for ; + Wed, 25 Mar 2015 09:09:58 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 0C2A3431FBC + for ; Wed, 25 Mar 2015 09:09:58 -0700 (PDT) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id 068EE100086; + Wed, 25 Mar 2015 18:09:29 +0200 (EET) +From: Tomi Ollila +To: David Bremner , David Bremner , + notmuch@notmuchmail.org +Subject: Re: [Patch v5 2/8] test: add support for compiling and running C + snippets +In-Reply-To: <1427203451-1540-3-git-send-email-david@tethera.net> +References: <1426352554-4383-10-git-send-email-david@tethera.net> + <1427203451-1540-1-git-send-email-david@tethera.net> + <1427203451-1540-3-git-send-email-david@tethera.net> +User-Agent: Notmuch/0.19+92~g402df12 (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 25 Mar 2015 16:10:01 -0000 + +On Tue, Mar 24 2015, David Bremner wrote: + +> This is to limit the copy-pasta involved in running C tests. I decided +> to keep things simple and not try to provide an actual C skeleton. +> +> The setting of LD_LIBRARY_PATH is to force using the built libnotmuch +> rather than any potential system one. +> --- +> test/README | 5 +++++ +> test/test-lib.sh | 15 +++++++++++++++ +> 2 files changed, 20 insertions(+) +> +> diff --git a/test/README b/test/README +> index 81a1c82..5b40474 100644 +> --- a/test/README +> +++ b/test/README +> @@ -84,6 +84,11 @@ the tests in one of the following ways. +> TEST_EMACS=my-special-emacs TEST_EMACSCLIENT=my-emacsclient ./emacs +> make test TEST_EMACS=my-special-emacs TEST_EMACSCLIENT=my-emacsclient +> +> +Some tests may require a c compiler. You can choose the name and flags similarly +> +to with emacs, e.g. +> + +> + make test TEST_CC=gcc TEST_CFLAGS="-g -O2" +> + +> Quiet Execution +> --------------- +> +> diff --git a/test/test-lib.sh b/test/test-lib.sh +> index 133fbe4..fdb84ea 100644 +> --- a/test/test-lib.sh +> +++ b/test/test-lib.sh +> @@ -73,6 +73,8 @@ if [[ ( -n "$TEST_EMACS" && -z "$TEST_EMACSCLIENT" ) || \ +> fi +> TEST_EMACS=${TEST_EMACS:-${EMACS:-emacs}} +> TEST_EMACSCLIENT=${TEST_EMACSCLIENT:-emacsclient} +> +TEST_CC=${TEST_CC:-cc} +> +TEST_CFLAGS=${TEST_CFLAGS:-"-g -O0"} +> +> # Protect ourselves from common misconfiguration to export +> # CDPATH into the environment +> @@ -1161,6 +1163,19 @@ test_python() { +> | $cmd - +> } +> +> +test_C () { +> + exec_file="test${test_count}" +> + test_file="${exec_file}.c" +> + cat > ${test_file} +> + export LD_LIBRARY_PATH=${TEST_DIRECTORY}/../lib +> + ${TEST_CC} ${TEST_CFLAGS} -I${TEST_DIRECTORY}/../lib -o ${exec_file} ${test_file} -L${TEST_DIRECTORY}/../lib/ -lnotmuch -ltalloc +> + echo "== stdout ==" > OUTPUT.stdout +> + echo "== stderr ==" > OUTPUT.stderr +> + ./${exec_file} "$@" 1>>OUTPUT.stdout 2>>OUTPUT.stderr +> + sed "s,$(pwd),CWD," OUTPUT.stdout OUTPUT.stderr > OUTPUT +> +} + +For next version you could change $(pwd) to ${PWD} -- to use shell variable +instead of forking subshell and run builtin command there to get the +same value. also, trailing g could be useful. i.e: + + sed "s,${PWD},CWD,g" OUTPUT.stdout OUTPUT.stderr > OUTPUT +