X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=resources%2Flibraries%2Fbash%2Ffunction%2Fper_patch.sh;h=c7fda3811856327125e88fb7148fb69d66cb4e96;hb=refs%2Fchanges%2F07%2F37907%2F2;hp=b6a572d654ecdf7a6c0492eb45761fd53c31b126;hpb=01d8f262afc567c3d49a23c3cb2cdeaced8a6887;p=csit.git diff --git a/resources/libraries/bash/function/per_patch.sh b/resources/libraries/bash/function/per_patch.sh index b6a572d654..c7fda38118 100644 --- a/resources/libraries/bash/function/per_patch.sh +++ b/resources/libraries/bash/function/per_patch.sh @@ -1,5 +1,5 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. -# Copyright (c) 2021 PANTHEON.tech s.r.o. +# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2023 PANTHEON.tech s.r.o. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -37,8 +37,7 @@ function archive_test_results () { cd "${VPP_DIR}" || die "Change directory command failed." TARGET="$(readlink -f "$1")" mkdir -p "${TARGET}" || die "Directory creation failed." - file_list=("output.xml" "log.html" "report.html") - file_list+=("tests" "tests_output_raw.tar.xz") + file_list=("output.xml" "log.html" "report.html" "tests") for filename in "${file_list[@]}"; do mv "${ARCHIVE_DIR}/${filename}" "${TARGET}/${filename}" || { die "Attempt to move '${filename}' failed." @@ -176,7 +175,7 @@ function parse_bmrr_results () { # TODO: Do we need to check echo exit code explicitly? echo "Parsing ${in_file} putting results into ${out_file}" echo "TODO: Re-use parts of PAL when they support subsample test parsing." - pattern='Maximum Receive Rate trial results in packets' + pattern='Maximum Receive Rate trial results in .*' pattern+=' per second: .*\]' grep -o "${pattern}" "${in_file}" | grep -o '\[.*\]' > "${out_file}" || { die "Some parsing grep command has failed."