From 3f4c2c0d435a4d61beed1fb0065a23cc093a4e20 Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Sun, 25 Jul 2010 16:55:46 +0200 Subject: [PATCH] gettext tests: locate i18n lib&data correctly under --valgrind MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The new t020[01] for gettext support did not find git-sh-i18n and the translation data when run under --valgrind: lib-gettext.sh tried to locate them under $GIT_EXEC_PATH, which normally is the git build directory, but is changed by --valgrind to point to the wrappers. Introduce a new variable $GIT_BUILD_DIR which can be used to locate data that resides under the build directory, and use that instead. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano Signed-off-by: Ævar Arnfjörð Bjarmason --- t/lib-gettext.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/lib-gettext.sh b/t/lib-gettext.sh index 831ee38e8..f0cdd3da9 100644 --- a/t/lib-gettext.sh +++ b/t/lib-gettext.sh @@ -5,11 +5,11 @@ . ./test-lib.sh -GIT_TEXTDOMAINDIR="$GIT_EXEC_PATH/share/locale" -GIT_PO_PATH="$GIT_EXEC_PATH/po" +GIT_TEXTDOMAINDIR="$GIT_BUILD_DIR/share/locale" +GIT_PO_PATH="$GIT_BUILD_DIR/po" export GIT_TEXTDOMAINDIR GIT_PO_PATH -. "$GIT_EXEC_PATH"/git-sh-i18n +. "$GIT_BUILD_DIR"/git-sh-i18n if test_have_prereq GETTEXT then -- 2.30.2