From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932672AbcC3IXL (ORCPT ); Wed, 30 Mar 2016 04:23:11 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33276 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754472AbcC3IXI (ORCPT ); Wed, 30 Mar 2016 04:23:08 -0400 From: Sedat Dilek Cc: Sedat Dilek , Sasha Levin , Linus Torvalds , Ingo Molnar , "Theodore Ts'o" , Boqun Feng , LKML , linux-fsdevel Subject: [PATCH] liblockdep: Fix unsupported 'basename -s' in run_tests.sh Date: Wed, 30 Mar 2016 10:22:49 +0200 Message-Id: <1459326169-7009-1-git-send-email-sedat.dilek@gmail.com> X-Mailer: git-send-email 2.8.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Here on Ubuntu/precise I have GNU/coreutils v8.13 installed where 'basename -s' is not supported. The result is that run_tests.sh is not done properly. [ INSTRUCTIONS ] $ cd $BUILD_DIR $ LC_ALL=C make -C tools/ liblockdep $ cd tools/lib/lockdep/ $ LC_ALL=C ./run_tests.sh basename: invalid option -- 's' Try `basename --help' for more information. ... timeout: failed to run command `./tests/': Permission denied FAILED! rm: cannot remove `tests/': Is a directory Due to unsupported basename the tests programs are not generated and cannot be removed. Fix this by doing a compatible basename invocation and check for the existence of generated tests programs. For more details see the thread in [1] on LKML. This patch is on top of Linux v4.6-rc1. [1] http://marc.info/?t=145906667300001&r=1&w=2 Cc: Sasha Levin (maintainer:LIBLOCKDEP) Cc: Linus Torvalds Cc: Ingo Molnar Cc: Theodore Ts'o Cc: Boqun Feng Cc: LKML Cc: linux-fsdevel Signed-off-by: Sedat Dilek --- tools/lib/lockdep/run_tests.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/lib/lockdep/run_tests.sh b/tools/lib/lockdep/run_tests.sh index 5334ad9d39b7..1069d96248c1 100755 --- a/tools/lib/lockdep/run_tests.sh +++ b/tools/lib/lockdep/run_tests.sh @@ -3,7 +3,7 @@ make &> /dev/null for i in `ls tests/*.c`; do - testname=$(basename -s .c "$i") + testname=$(basename "$i" .c) gcc -o tests/$testname -pthread -lpthread $i liblockdep.a -Iinclude -D__USE_LIBLOCKDEP &> /dev/null echo -ne "$testname... " if [ $(timeout 1 ./tests/$testname | wc -l) -gt 0 ]; then @@ -11,11 +11,13 @@ for i in `ls tests/*.c`; do else echo "FAILED!" fi - rm tests/$testname + if [ -f "tests/$testname" ]; then + rm tests/$testname + fi done for i in `ls tests/*.c`; do - testname=$(basename -s .c "$i") + testname=$(basename "$i" .c) gcc -o tests/$testname -pthread -lpthread -Iinclude $i &> /dev/null echo -ne "(PRELOAD) $testname... " if [ $(timeout 1 ./lockdep ./tests/$testname | wc -l) -gt 0 ]; then @@ -23,5 +25,7 @@ for i in `ls tests/*.c`; do else echo "FAILED!" fi - rm tests/$testname + if [ -f "tests/$testname" ]; then + rm tests/$testname + fi done -- 2.8.0