diff --git a/Sanity/testsuite/runtest.sh b/Sanity/testsuite/runtest.sh index b67041d..cd083b7 100755 --- a/Sanity/testsuite/runtest.sh +++ b/Sanity/testsuite/runtest.sh @@ -129,34 +129,42 @@ rlJournalStart rlPhaseStartTest "misc_tests" if [ -d $TESTDIR/misc_tests ]; then - reset_tokens - pushd $TESTDIR/misc_tests + reset_tokens + pushd $TESTDIR/misc_tests - # obj_mgmt_tests - ID=`get_test_id` - rlRun "./obj_mgmt_tests $NOSKIP -slot $SLOT &> $TmpDir/testlog.$ID" - [ $? -gt 0 ] && echo -e "Test log:\n" && cat $TmpDir/testlog.$ID # print log in case of error + # obj_mgmt_tests + ID=`get_test_id` + rlRun "./obj_mgmt_tests $NOSKIP -slot $SLOT &> $TmpDir/testlog.$ID" + [ $? -gt 0 ] && echo -e "Test log:\n" && cat $TmpDir/testlog.$ID # print log in case of error - #spinlock_tests.sh - ID=`get_test_id` - rlRun "./spinlock_tests.sh -s 1 -p 10 -l 20 &> $TmpDir/testlog.$ID" - [ $? -gt 0 ] && echo -e "Test log:\n" && cat $TmpDir/testlog.$ID # print log in case of error + #spinlock_tests.sh + ID=`get_test_id` + rlRun "./spinlock_tests.sh -s 1 -p 10 -l 20 &> $TmpDir/testlog.$ID" + [ $? -gt 0 ] && echo -e "Test log:\n" && cat $TmpDir/testlog.$ID # print log in case of error - #fork - ID=`get_test_id` - rlRun "./fork -slot $SLOT &> $TmpDir/testlog.$ID" - [ $? -gt 0 ] && echo -e "Test log:\n" && cat $TmpDir/testlog.$ID # print log in case of error - rlAssertGrep 'Errors=0' $TmpDir/testlog.$ID - rlAssertGrep 'Failed=0' $TmpDir/testlog.$ID - - # events - added in 3.16.0-3.el9 - if nvrTestPackage opencryptoki '>=' 3.16.0; then - ID=`get_test_id` - rlRun "./events -slot $SLOT &> $TmpDir/testlog.$ID" - [ $? -gt 0 ] && echo -e "Test log:\n" && cat $TmpDir/testlog.$ID # print log in case of error + #fork + ID=`get_test_id` + rlRun "./fork -slot $SLOT &> $TmpDir/testlog.$ID" + [ $? -gt 0 ] && echo -e "Test log:\n" && cat $TmpDir/testlog.$ID # print log in case of error rlAssertGrep 'Errors=0' $TmpDir/testlog.$ID rlAssertGrep 'Failed=0' $TmpDir/testlog.$ID - fi + + # events - added in 3.16.0-3.el9 + if nvrTestPackage opencryptoki '>=' 3.16.0; then + ID=`get_test_id` + rlRun "./events -slot $SLOT &> $TmpDir/testlog.$ID" + [ $? -gt 0 ] && echo -e "Test log:\n" && cat $TmpDir/testlog.$ID # print log in case of error + rlAssertGrep 'Errors=0' $TmpDir/testlog.$ID + rlAssertGrep 'Failed=0' $TmpDir/testlog.$ID + fi + + # p11sak_test.sh added in 3.17.0 + if nvrTestPackage opencryptoki '>=' 3.17.0; then + ID=`get_test_id` + rlRun "SLOT=$SLOT ./p11sak_test.sh &> $TmpDir/testlog.$ID" + [ $? -gt 0 ] && echo -e "Test log:\n" && cat $TmpDir/testlog.$ID # print log in case of error + rlAssertNotGrep 'TESTCASE.*FAIL' $TmpDir/testlog.$ID -E + fi popd else