lkml.org 
[lkml]   [2021]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 103/279] perf tests: Remove bash construct from record+zstd_comp_decomp.sh
    Date
    From: James Clark <james.clark@arm.com>

    [ Upstream commit a9cdc1c5e3700a5200e5ca1f90b6958b6483845b ]

    Commit 463538a383a2 ("perf tests: Fix test 68 zstd compression for
    s390") inadvertently removed the -g flag from all platforms rather than
    just s390, because the [[ ]] construct fails in sh. Changing to single
    brackets restores testing of call graphs and removes the following error
    from the output:

    $ ./perf test -v 85
    85: Zstd perf.data compression/decompression :
    --- start ---
    test child forked, pid 50643
    Collecting compressed record file:
    ./tests/shell/record+zstd_comp_decomp.sh: 15: [[: not found

    Fixes: 463538a383a2 ("perf tests: Fix test 68 zstd compression for s390")
    Signed-off-by: James Clark <james.clark@arm.com>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Florian Fainelli <f.fainelli@gmail.com>
    Cc: Ian Rogers <irogers@google.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: John Fastabend <john.fastabend@gmail.com>
    Cc: KP Singh <kpsingh@kernel.org>
    Cc: Mark Rutland <mark.rutland@arm.com>
    Cc: Martin KaFai Lau <kafai@fb.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Song Liu <songliubraving@fb.com>
    Cc: Sumanth Korikkar <sumanthk@linux.ibm.com>
    Cc: Thomas Richter <tmricht@linux.ibm.com>
    Cc: Yonghong Song <yhs@fb.com>
    Cc: bpf@vger.kernel.org
    Cc: netdev@vger.kernel.org
    Link: https://lore.kernel.org/r/20211028134828.65774-3-james.clark@arm.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/perf/tests/shell/record+zstd_comp_decomp.sh | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/perf/tests/shell/record+zstd_comp_decomp.sh b/tools/perf/tests/shell/record+zstd_comp_decomp.sh
    index 8a168cf8bacca..49bd875d51227 100755
    --- a/tools/perf/tests/shell/record+zstd_comp_decomp.sh
    +++ b/tools/perf/tests/shell/record+zstd_comp_decomp.sh
    @@ -12,7 +12,7 @@ skip_if_no_z_record() {

    collect_z_record() {
    echo "Collecting compressed record file:"
    - [[ "$(uname -m)" != s390x ]] && gflag='-g'
    + [ "$(uname -m)" != s390x ] && gflag='-g'
    $perf_tool record -o $trace_file $gflag -z -F 5000 -- \
    dd count=500 if=/dev/urandom of=/dev/null
    }
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-24 15:10    [W:4.037 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site