From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Rast Subject: [PATCH] Symlink mergetools scriptlets into valgrind wrappers Date: Tue, 30 Aug 2011 02:47:36 +0200 Message-ID: Mime-Version: 1.0 Content-Type: text/plain Cc: , Jeff King , David Aguilar To: Junio C Hamano X-From: git-owner@vger.kernel.org Tue Aug 30 02:47:46 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QyCUT-0002Sj-Ms for gcvg-git-2@lo.gmane.org; Tue, 30 Aug 2011 02:47:46 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751278Ab1H3Arj (ORCPT ); Mon, 29 Aug 2011 20:47:39 -0400 Received: from edge10.ethz.ch ([82.130.75.186]:57904 "EHLO edge10.ethz.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750799Ab1H3Arj (ORCPT ); Mon, 29 Aug 2011 20:47:39 -0400 Received: from CAS22.d.ethz.ch (172.31.51.112) by edge10.ethz.ch (82.130.75.186) with Microsoft SMTP Server (TLS) id 14.1.289.1; Tue, 30 Aug 2011 02:47:37 +0200 Received: from localhost.localdomain (188.155.176.28) by CAS22.d.ethz.ch (172.31.51.112) with Microsoft SMTP Server (TLS) id 14.1.289.1; Tue, 30 Aug 2011 02:47:37 +0200 X-Mailer: git-send-email 1.7.7.rc0.370.gdcae57 X-Originating-IP: [188.155.176.28] Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Since bc7a96a (mergetool--lib: Refactor tools into separate files, 2011-08-18) the mergetools and difftools related tests fail under --valgrind because the mergetools/* scriptlets are not in the exec path. For now, symlink the mergetools subdir into the t/valgrind/bin directory as a whole, since it does not contain anything of interest to the valgrind wrappers. Signed-off-by: Thomas Rast --- t/test-lib.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index d7dfc8b..bdd9513 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -950,6 +950,8 @@ then do make_valgrind_symlink $file done + # special-case the mergetools loadables + make_symlink "$GIT_BUILD_DIR"/mergetools "$GIT_VALGRIND/bin/mergetools" OLDIFS=$IFS IFS=: for path in $PATH -- 1.7.7.rc0.370.gdcae57