From 3ae0bce41726d04cabfcae1c357fa0609f11555c Mon Sep 17 00:00:00 2001 From: David Valin Date: Thu, 19 Sep 2024 05:50:44 -0400 Subject: [PATCH 1/2] Add metadata to results. --- phoronix/run_phoronix.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/phoronix/run_phoronix.sh b/phoronix/run_phoronix.sh index f39a7a4..4718204 100755 --- a/phoronix/run_phoronix.sh +++ b/phoronix/run_phoronix.sh @@ -256,12 +256,22 @@ else ${curdir}/test_tools/move_data $curdir results_${test_name}_${to_tuned_setting}/phoronix_results/results_phoronix cp /tmp/results_${test_name}_${to_tuned_setting}.out results_${test_name}_${to_tuned_setting}/phoronix_results/results_phoronix pushd /tmp/results_${test_name}_${to_tuned_setting}/phoronix_results/results_phoronix > /dev/null - $run_dir/reduce_phoronix > results.csv - lines=`wc -l results.csv | cut -d' ' -f 1` + $TOOLS_BIN/test_header_info --front_matter --results_file results.csv --host $to_configuration --sys_type $to_sys_type --tuned $to_tuned_setting --results_version $GIT_VERSION --test_name $test_name + # + # We place the results first in results_check.csv so we can check to make sure + # the tests actually ran. After the check, we will add the run info to results.csv. + # + $run_dir/reduce_phoronix > results_check.csv + lines=`wc -l results_check.csv | cut -d' ' -f 1` if [[ $lines == "1" ]]; then + # + # We failed, report and do not remove the results_check.csv file. + # echo Failed >> test_results_report else echo Ran >> test_results_report + cat results_check.csv >> results.csv + rm results_check.csv fi popd > /dev/null find -L $RESULTSDIR -type f | tar --transform 's/.*\///g' -cf results_pbench.tar --files-from=/dev/stdin From 6796b1d35da7fc62987faab5a5b022829bd5fd66 Mon Sep 17 00:00:00 2001 From: David Valin Date: Fri, 20 Sep 2024 04:30:15 -0400 Subject: [PATCH 2/2] Review comment updates. --- phoronix/run_phoronix.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/phoronix/run_phoronix.sh b/phoronix/run_phoronix.sh index 4718204..fb4ba3e 100755 --- a/phoronix/run_phoronix.sh +++ b/phoronix/run_phoronix.sh @@ -17,6 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. test_index="Test All Options" +rtc=0 arguments="$@" @@ -268,6 +269,7 @@ else # We failed, report and do not remove the results_check.csv file. # echo Failed >> test_results_report + rtc=1 else echo Ran >> test_results_report cat results_check.csv >> results.csv @@ -278,4 +280,4 @@ else ${curdir}/test_tools/save_results --curdir $curdir --home_root $to_home_root --copy_dir $RESULTSDIR --test_name $test_name --tuned_setting=$to_tuned_setting --version $coremark_version none --user $to_user fi -exit 0 +exit $rtc