Skip to content

Add verification of results via regexp #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add verification of results via regexp #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions hammerdb/base_test_results/test1/verify
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
%_header
# connection:TPM
%_multiples
[[:digit:]][[:digit:]]{0,}:[1-9][0-9.]{1,}:1$
19 changes: 13 additions & 6 deletions hammerdb/hammerdb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=""

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
4 changes: 4 additions & 0 deletions hammerdb/verification_config/test_verify
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading