From bd7bfc2917ad9a47c89ce43f7b9161013baaac8e Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Thu, 26 May 2016 00:37:40 +0300 Subject: [PATCH] [PATCH 1/2] test: set LD_LIBRARY_PATH early and keep its old contents --- d7/91165cb919203cdae95b5b361651b72e48feab | 126 ++++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 d7/91165cb919203cdae95b5b361651b72e48feab diff --git a/d7/91165cb919203cdae95b5b361651b72e48feab b/d7/91165cb919203cdae95b5b361651b72e48feab new file mode 100644 index 000000000..7ba8dda32 --- /dev/null +++ b/d7/91165cb919203cdae95b5b361651b72e48feab @@ -0,0 +1,126 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 9750A6DE0217 + for ; Wed, 25 May 2016 14:37:54 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.255 +X-Spam-Level: +X-Spam-Status: No, score=0.255 tagged_above=-999 required=5 tests=[AWL=0.264, + HEADER_FROM_DIFFERENT_DOMAINS=0.001, T_RP_MATCHES_RCVD=-0.01] + autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id TOP-BzexOjTf for ; + Wed, 25 May 2016 14:37:46 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by arlo.cworth.org (Postfix) with ESMTP id 5FBAE6DE00EB + for ; Wed, 25 May 2016 14:37:46 -0700 (PDT) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 6BDB71000C6; Thu, 26 May 2016 00:37:42 +0300 (EEST) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Cc: tomi.ollila@iki.fi +Subject: [PATCH 1/2] test: set LD_LIBRARY_PATH early and keep its old contents +Date: Thu, 26 May 2016 00:37:40 +0300 +Message-Id: <1464212261-26892-1-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 2.8.2 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +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 May 2016 21:37:54 -0000 + +Previously LD_LIBRARY_PATH was exported (and environment changed) +in the middle of test case execution, when a function setting it +was called. + +Previously the old contents of LD_LIBRARY_PATH was lost (if any) +when it was re-set and exported. In some systems the old contents of +LD_LIBRARY_PATH was needed to e.g. locate suitable gmime library. +--- + +This series (of 2 patches) has exactly same payload as the previous +version: + id:1460738800-9021-1-git-send-email-tomi.ollila@iki.fi + +commit messages are updated to be accurate (? :) this time. + + test/T360-symbol-hiding.sh | 5 ++--- + test/test-lib-common.sh | 5 +++++ + test/test-lib.sh | 3 --- + 3 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh +index 3f18ec1a34fc..9c10e8eda07f 100755 +--- a/test/T360-symbol-hiding.sh ++++ b/test/T360-symbol-hiding.sh +@@ -13,9 +13,8 @@ test_description='exception symbol hiding' + + test_begin_subtest 'running test' run_test + mkdir -p ${PWD}/fakedb/.notmuch +-( LD_LIBRARY_PATH="$TEST_DIRECTORY/../lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \ +- $TEST_DIRECTORY/symbol-test ${PWD}/fakedb ${PWD}/nonexistent \ +- 2>&1 | notmuch_dir_sanitize | sed -e "s,\`,\',g" -e "s,${NOTMUCH_DEFAULT_XAPIAN_BACKEND},backend,g") > OUTPUT ++$TEST_DIRECTORY/symbol-test ${PWD}/fakedb ${PWD}/nonexistent 2>&1 \ ++ | notmuch_dir_sanitize | sed -e "s,\`,\',g" -e "s,${NOTMUCH_DEFAULT_XAPIAN_BACKEND},backend,g" > OUTPUT + + cat < EXPECTED + A Xapian exception occurred opening database: Couldn't stat 'CWD/fakedb/.notmuch/xapian' +diff --git a/test/test-lib-common.sh b/test/test-lib-common.sh +index ba4a8e112084..026440ccc057 100644 +--- a/test/test-lib-common.sh ++++ b/test/test-lib-common.sh +@@ -52,6 +52,11 @@ restore_database () { + TEST_DIRECTORY=$(pwd -P) + notmuch_path=`find_notmuch_path "$TEST_DIRECTORY"` + ++# Prepend $TEST_DIRECTORY/../lib to LD_LIBRARY_PATH, to make tests work ++# on systems where ../notmuch depends on LD_LIBRARY_PATH. ++LD_LIBRARY_PATH=${TEST_DIRECTORY%/*}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ++export LD_LIBRARY_PATH ++ + # configure output + . $notmuch_path/sh.config || exit 1 + +diff --git a/test/test-lib.sh b/test/test-lib.sh +index 62e123d65aba..a7e6397c324e 100644 +--- a/test/test-lib.sh ++++ b/test/test-lib.sh +@@ -1171,7 +1171,6 @@ test_emacs () { + } + + test_python() { +- export LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib + export PYTHONPATH=$TEST_DIRECTORY/../bindings/python + + (echo "import sys; _orig_stdout=sys.stdout; sys.stdout=open('OUTPUT', 'w')"; cat) \ +@@ -1179,7 +1178,6 @@ test_python() { + } + + test_ruby() { +- export LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib + MAIL_DIR=$MAIL_DIR ruby -I $TEST_DIRECTORY/../bindings/ruby> OUTPUT + } + +@@ -1187,7 +1185,6 @@ 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 +-- +2.8.2 + -- 2.26.2