[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-a189c017ded0f13650793067fb7a1afbc2b98cd5@git.kernel.org>
Date: Wed, 30 Mar 2016 03:51:38 -0700
From: tip-bot for Sedat Dilek <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: peterz@...radead.org, shuahkh@....samsung.com,
linux-kernel@...r.kernel.org, torvalds@...ux-foundation.org,
mingo@...nel.org, hpa@...or.com, sedat.dilek@...il.com,
tglx@...utronix.de, boqun.feng@...il.com,
linux-fsdevel@...r.kernel.org, tytso@....edu
Subject: [tip:core/urgent] tools/lib/lockdep: Fix unsupported 'basename -s'
in run_tests.sh
Commit-ID: a189c017ded0f13650793067fb7a1afbc2b98cd5
Gitweb: http://git.kernel.org/tip/a189c017ded0f13650793067fb7a1afbc2b98cd5
Author: Sedat Dilek <sedat.dilek@...il.com>
AuthorDate: Wed, 30 Mar 2016 10:22:49 +0200
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Wed, 30 Mar 2016 12:45:56 +0200
tools/lib/lockdep: Fix unsupported 'basename -s' in run_tests.sh
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.
How to reproduce:
$ 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 this LKML thread:
http://marc.info/?t=145906667300001&r=1&w=2
Signed-off-by: Sedat Dilek <sedat.dilek@...il.com>
Cc: Boqun Feng <boqun.feng@...il.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Sasha Levin <sasha.levin@...cle.com> (maintainer:LIBLOCKDEP)
Cc: Shuah Khan <shuahkh@....samsung.com>
Cc: Theodore Ts'o <tytso@....edu>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: linux-fsdevel <linux-fsdevel@...r.kernel.org>
Link: http://lkml.kernel.org/r/1459326169-7009-1-git-send-email-sedat.dilek@gmail.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
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 5334ad9..1069d96 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
Powered by blists - more mailing lists