From 34554acd706b6f6351a2bc968603b6cbd9b28649 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 14 Mar 2015 18:02:27 +0100 Subject: [PATCH] [Patch v4 2/9] test: add support for compiling and running C snippets --- a8/718aa03381644a8f5e894fe105788e3022294d | 111 ++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 a8/718aa03381644a8f5e894fe105788e3022294d diff --git a/a8/718aa03381644a8f5e894fe105788e3022294d b/a8/718aa03381644a8f5e894fe105788e3022294d new file mode 100644 index 000000000..5da2b8bfa --- /dev/null +++ b/a8/718aa03381644a8f5e894fe105788e3022294d @@ -0,0 +1,111 @@ +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 14ED3431FD5 + for ; Sat, 14 Mar 2015 10:04:11 -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 PVfsYFYW1bID for ; + Sat, 14 Mar 2015 10:04:09 -0700 (PDT) +Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net + [87.98.215.224]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 43FA7431FD2 + for ; Sat, 14 Mar 2015 10:04:09 -0700 (PDT) +Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim + 4.80) (envelope-from ) + id 1YWpT7-00026X-Oj; Sat, 14 Mar 2015 17:03:21 +0000 +Received: (nullmailer pid 4983 invoked by uid 1000); Sat, 14 Mar 2015 + 17:02:41 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [Patch v4 2/9] test: add support for compiling and running C snippets +Date: Sat, 14 Mar 2015 18:02:27 +0100 +Message-Id: <1426352554-4383-3-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: <1426352554-4383-1-git-send-email-david@tethera.net> +References: <1426352554-4383-1-git-send-email-david@tethera.net> +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: Sat, 14 Mar 2015 17:04:11 -0000 + +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..c7af003 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() { ++ test_file="test${test_count}.c" ++ exec_file=${test_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 ++ echo "== stdout ==" > OUTPUT.stdout ++ echo "== stderr ==" > OUTPUT.stderr ++ ./${exec_file} "$@" 1>>OUTPUT.stdout 2>>OUTPUT.stderr ++ cat OUTPUT.stdout OUTPUT.stderr | sed "s,$(pwd),CWD," > OUTPUT ++} ++ ++ + # Creates a script that counts how much time it is executed and calls + # notmuch. $notmuch_counter_command is set to the path to the + # generated script. Use notmuch_counter_value() function to get the +-- +2.1.4 + -- 2.26.2