From 69b88c520d96c57ea6526463c2de7d34cf4e95ed Mon Sep 17 00:00:00 2001 From: David Valin Date: Tue, 6 Aug 2024 13:35:57 -0400 Subject: [PATCH] Quiet things down, message wise. --- pyperf/pyperf_run | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pyperf/pyperf_run b/pyperf/pyperf_run index a77be0c..b265cf8 100755 --- a/pyperf/pyperf_run +++ b/pyperf/pyperf_run @@ -111,7 +111,7 @@ generate_csv_file() pip3_install() { if [ $to_no_pkg_install -eq 0 ]; then - pip3 install $1 + pip3 -q install $1 if [ $? -ne 0 ]; then exit_out "pip3 install of $1 failed." 1 fi @@ -190,7 +190,7 @@ if [ -d "workloads" ]; then cd workloads for file in `ls ${start_dir}`; do if [[ ! -f $file ]] && [[ ! -d $file ]]; then - ln -s $start_dir/* . + ln -s $start_dir/$file . fi done fi @@ -272,6 +272,9 @@ if [ $to_pbench -eq 0 ]; then # Install pip/pip3 # wget https://bootstrap.pypa.io/get-pip.py + if [[ $? -ne 0 ]]; then + exit_out "Failed: wget https://bootstrap.pypa.io/get-pip.py" 1 + fi python3 ./get-pip.py pip3_install psutil pip3_install packaging @@ -314,11 +317,5 @@ fi # # Process the data. # -if [ $to_pbench -eq 1 ]; then - results_prefix=$to_puser"_instance_"$to_configuration - dir=`ls -rtd /var/lib/pbench-agent/pyperf* | tail -1` - cd $dir -else - ${curdir}/test_tools/save_results --curdir $curdir --home_root $to_home_root --results /tmp/pyperf.out --test_name pyperf --tuned_setting=$to_tuned_setting --version NONE --user $to_user --other_files "python_results/*,test_results_report" -fi +${curdir}/test_tools/save_results --curdir $curdir --home_root $to_home_root --results /tmp/pyperf.out --test_name pyperf --tuned_setting=$to_tuned_setting --version NONE --user $to_user --other_files "python_results/*,test_results_report" exit 0