From 96544fca522e66b4f69b4252854a5f672c96f9c4 Mon Sep 17 00:00:00 2001 From: Nikolai Kondrashov Date: Fri, 2 Oct 2015 19:08:47 +0300 Subject: CI: Handle dashes in valgrind-condense MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make valgrind-condense work on program names which start with a dash character. Reviewed-by: Lukáš Slebodník --- contrib/ci/valgrind-condense | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'contrib') diff --git a/contrib/ci/valgrind-condense b/contrib/ci/valgrind-condense index e64048ab5..eb3f3226f 100755 --- a/contrib/ci/valgrind-condense +++ b/contrib/ci/valgrind-condense @@ -119,12 +119,12 @@ if $match; then program_path=`sed -e 's/^\(.*\/\)\?\.libs\/lt-\([^\/]\+\)$/\1\2/' \ <<<"$program_path"` - program_name=`basename "$program_path"` + program_name=`basename -- "$program_path"` - rm -f "$program_name".*.valgrind.log + rm -f -- "$program_name".*.valgrind.log valgrind --log-file="$program_name.%p.valgrind.log" "$@" || status=$? - if grep -q '^==[0-9]\+== *ERROR SUMMARY: *[1-9]' \ + if grep -q '^==[0-9]\+== *ERROR SUMMARY: *[1-9]' -- \ "$program_name".*.valgrind.log; then exit "$error_exitcode" else -- cgit