From 55ece84484cd9313540e1dd7b7d5bde1375a8fc4 Mon Sep 17 00:00:00 2001 From: David Valin Date: Mon, 23 Jun 2025 05:13:53 -0400 Subject: [PATCH 1/4] Add verification of results via regexp --- hammerdb/base_test_results/test1/verify | 4 ++++ hammerdb/hammerdb | 19 +++++++++++++------ hammerdb/verification_config/test_verify | 4 ++++ 3 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 hammerdb/base_test_results/test1/verify create mode 100644 hammerdb/verification_config/test_verify diff --git a/hammerdb/base_test_results/test1/verify b/hammerdb/base_test_results/test1/verify new file mode 100644 index 0000000..5247703 --- /dev/null +++ b/hammerdb/base_test_results/test1/verify @@ -0,0 +1,4 @@ +%_header +# connection:TPM +%_multiples +[[:digit:]][[:digit:]]{0,}:[1-9][0-9.]{1,}:1$ diff --git a/hammerdb/hammerdb b/hammerdb/hammerdb index 9596b65..bda8635 100755 --- a/hammerdb/hammerdb +++ b/hammerdb/hammerdb @@ -18,6 +18,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +ertc=1 arguments="$@" log_mount="" @@ -128,7 +129,9 @@ fi # ${curdir}/test_tools/gather_data ${curdir} +pushd $curdir > /dev//null source test_tools/general_setup "$@" +popd > /dev/null dnf -y install lvm2 @@ -304,12 +307,6 @@ mv HammerDB $test ${curdir}/test_tools/move_data $curdir $test pushd $test -files=`ls test*out` -if [ $? -ne 0 ]; then - echo Failed >> test_results_report -else - echo Ran >> test_results_report -fi cp /tmp/hammerdb.out . popd @@ -319,6 +316,15 @@ tmp_file=`mktemp /tmp/hammer_data.XXXXX` find -L $test -type f -exec grep -Iq . {} \; -print > $tmp_file #echo "/usr/local/${test}/results_hammerdb_*.csv" >> $tmp_file egrep "out|csv|report" $tmp_file | egrep -v "Hammerdb" | grep -v tcl | tar cf /tmp/results_hammerdb_${test}_${to_tuned_setting}.tar --files-from=/dev/stdin +csv_file=`grep csv $tmp_file | grep -v "Hammerdb" | grep -v tcl` +${curdir}/test_tools/validate_line --results_file $csv_file --base_results_file $exec_dir/base_test_results/test1/verify +if [ $? -ne 0 ]; then + echo Failed > test_results_report + ertc=1 +else + echo Ran > test_results_report +fi + ${curdir}/test_tools/save_results --curdir $curdir --home_root $to_home_root --tar_file /tmp/results_hammerdb_${test}_${to_tuned_setting}.tar --test_name hammerdb_$test_name_${test} --tuned_setting=$to_tuned_setting --version "None" --user $to_user rm $tmp_file @@ -328,3 +334,4 @@ fi ## Re-enable selinux setenforce 1 $TOOLS_BIN/lvm_delete --lvm_vol hammerdb --lvm_grp hammerdb --mount_pnt /perf1 +exit $ertc diff --git a/hammerdb/verification_config/test_verify b/hammerdb/verification_config/test_verify new file mode 100644 index 0000000..51e90b7 --- /dev/null +++ b/hammerdb/verification_config/test_verify @@ -0,0 +1,4 @@ +equired_Systems: intel,amd,arm +Via_Zathras: No +test:--iterations 1 --disks grab_disks --sub_test mariadb:base_test_results/test1/verify +test:--iterations 1 --disks grab_disks --sub_test postgres:base_test_results/test1/verify From 162ed8717169259bf310f985ef649cf72be39116 Mon Sep 17 00:00:00 2001 From: David Valin Date: Tue, 29 Jul 2025 08:26:21 -0400 Subject: [PATCH 2/4] Update verification file. Assisted-by: Gemini --- hammerdb/base_test_results/test1/verify | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hammerdb/base_test_results/test1/verify b/hammerdb/base_test_results/test1/verify index 5247703..114503e 100644 --- a/hammerdb/base_test_results/test1/verify +++ b/hammerdb/base_test_results/test1/verify @@ -1,4 +1,11 @@ +# +# regexp explanation +# +# [[1-9]][[0-9]]{0,}:[1-9][0-9.]{1,}$ +# +# Field 1 number connections: [[1-9]][[0-9]]{0,}. Any value greater than 0 +# Field 2 number transactions per minute: [[1-9]][[0-9]]{0,}. Any value greater than 0 %_header # connection:TPM %_multiples -[[:digit:]][[:digit:]]{0,}:[1-9][0-9.]{1,}:1$ +[[1-9]][[0-9]]{0,}:[1-9][0-9.]{1,}$ From 7a408796de9c299e131310bd2deeca48a0713833 Mon Sep 17 00:00:00 2001 From: David Valin Date: Tue, 29 Jul 2025 12:45:30 -0400 Subject: [PATCH 3/4] Escape . --- hammerdb/base_test_results/test1/verify | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hammerdb/base_test_results/test1/verify b/hammerdb/base_test_results/test1/verify index 114503e..38f55dd 100644 --- a/hammerdb/base_test_results/test1/verify +++ b/hammerdb/base_test_results/test1/verify @@ -4,8 +4,8 @@ # [[1-9]][[0-9]]{0,}:[1-9][0-9.]{1,}$ # # Field 1 number connections: [[1-9]][[0-9]]{0,}. Any value greater than 0 -# Field 2 number transactions per minute: [[1-9]][[0-9]]{0,}. Any value greater than 0 +# Field 2 number transactions per minute: [[1-9]][[0-9\.]]{0,}. Any value greater than 0 %_header # connection:TPM %_multiples -[[1-9]][[0-9]]{0,}:[1-9][0-9.]{1,}$ +[[1-9]][[0-9]]{0,}:[1-9][0-9\.]{1,}$ From 5579f6a6ab03c3876ab5f77ed70b7c7173d17053 Mon Sep 17 00:00:00 2001 From: David Valin Date: Tue, 29 Jul 2025 13:36:56 -0400 Subject: [PATCH 4/4] Sync up comment --- hammerdb/base_test_results/test1/verify | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hammerdb/base_test_results/test1/verify b/hammerdb/base_test_results/test1/verify index 38f55dd..19cf325 100644 --- a/hammerdb/base_test_results/test1/verify +++ b/hammerdb/base_test_results/test1/verify @@ -1,7 +1,7 @@ # # regexp explanation # -# [[1-9]][[0-9]]{0,}:[1-9][0-9.]{1,}$ +# [[1-9]][[0-9]]{0,}:[1-9][0-9\.]{1,}$ # # Field 1 number connections: [[1-9]][[0-9]]{0,}. Any value greater than 0 # Field 2 number transactions per minute: [[1-9]][[0-9\.]]{0,}. Any value greater than 0