diff --git a/Trigger/TrigValidation/TrigValTools/bin/trigtest.pl b/Trigger/TrigValidation/TrigValTools/bin/trigtest.pl index b127fef8efed91e2f882efa72f665601c2637dff..acc6732eb0d670cb1b52b310c94cae18f5a37ebc 100755 --- a/Trigger/TrigValidation/TrigValTools/bin/trigtest.pl +++ b/Trigger/TrigValidation/TrigValTools/bin/trigtest.pl @@ -1122,7 +1122,8 @@ sub run_test($){ } else { print "=== $name: mergecheck: the test passed successfully. \n"; } - systemcall("grep -A 7 'Summary' $checkmergeout"); + systemcall("grep 'ERROR' $checkmergeout"); + systemcall("grep 'WARNING' $checkmergeout"); } # EDM tests diff --git a/Trigger/TrigValidation/TrigValTools/bin/trigtest_check_merge.sh b/Trigger/TrigValidation/TrigValTools/bin/trigtest_check_merge.sh index 5dbb8bdeb8397cccb3e716b8e8c9477eb912fdb1..145f578d887e7b70f8be600f7031918b720d0290 100755 --- a/Trigger/TrigValidation/TrigValTools/bin/trigtest_check_merge.sh +++ b/Trigger/TrigValidation/TrigValTools/bin/trigtest_check_merge.sh @@ -18,5 +18,12 @@ if [ `grep "ERRORS found" TrigTest_CheckMerge.log | wc -l` -gt 0 ]; then echo 'check merge failed' exit 127 fi + +if [ `grep "WARNING" TrigTest_CheckMerge.log | wc -l` -gt 0 ]; then + echo 'TrigTest_CheckMerge test has WARNING' + exit 0 +fi + + echo "check merge success" exit 0 diff --git a/Trigger/TrigValidation/TrigValTools/macros/TrigTest_CheckMerge.C b/Trigger/TrigValidation/TrigValTools/macros/TrigTest_CheckMerge.C index 8b0905c2ebacfafa057b41a1b4e4d0289c028471..716e60bf538935101204dfee9daf0c10ac313999 100644 --- a/Trigger/TrigValidation/TrigValTools/macros/TrigTest_CheckMerge.C +++ b/Trigger/TrigValidation/TrigValTools/macros/TrigTest_CheckMerge.C @@ -373,7 +373,7 @@ void checkROSAccess( TDirectory *mergedir){ c1->SaveAs("checkROSAccess.gif"); - printf("CheckROSAccess for %d algorithms: \n", h1->GetNbinsX()); + printf("checkROSAccess for %d algorithms: \n", h1->GetNbinsX()); printf(" %-65s REQ | MISS | MISS | MISS | MISS |\n",""); printf(" %-65s ROS | ALLEXE | EXE | ALLPREF | PREF |\n",""); printf(" %-65s-----------------------------------------------------------|\n",""); @@ -384,12 +384,12 @@ void checkROSAccess( TDirectory *mergedir){ if (h2->GetBinContent(i) != 0 ) { if (h2->GetBinContent(i) == h1->GetBinContent(i)) {// all the ROBs are missed missAllROSRequest[n_missAllROSRequest]=label; - if (debug) printf(" %-5d | |", h2->GetBinContent(i) ); + printf(" %-5d | |", h2->GetBinContent(i) ); n_missAllROSRequest++; } else { missROSRequest[n_missROSRequest]=label; - if (debug) printf(" | %-5d |", h2->GetBinContent(i) ); + printf(" | %-5d |", h2->GetBinContent(i) ); n_missROSRequest++; } } @@ -398,12 +398,12 @@ void checkROSAccess( TDirectory *mergedir){ if (h3->GetBinContent(i) != 0 ) { if (h3->GetBinContent(i) == h1->GetBinContent(i)) {// all the ROBs are missed missAllROSPrefetch[n_missAllROSPrefetch]=label; - if (debug) printf(" %-5d | |", h3->GetBinContent(i) ); + printf(" %-5d | |", h3->GetBinContent(i) ); n_missAllROSPrefetch++; } else { missROSPrefetch[n_missROSPrefetch]=label; - if (debug) printf(" | %-5d |", h3->GetBinContent(i) ); + printf(" | %-5d |", h3->GetBinContent(i) ); n_missROSPrefetch++; } } @@ -413,14 +413,14 @@ void checkROSAccess( TDirectory *mergedir){ printf(" %-65s-----------------------------------------------------------|\n",""); printf("\n"); - printf("# algos with missed ROB fragments during the execution: %d \n", n_missROSRequest); - printf("# algos with missed ROS requests during the execution: %d \n", n_missAllROSRequest); - printf("# algos with missed ROB fragments during the prefetch: %d \n", n_missROSPrefetch); - printf("# algos with missed ROS requests during the prefetch: %d \n", n_missAllROSPrefetch); + printf("# algos with missed ROB fragments during the execution: %d %s \n", n_missROSRequest, (n_missROSRequest!=0? " --> WARNING":"") ); + printf("# algos with missed ROS requests during the execution: %d %s \n", n_missAllROSRequest, (n_missAllROSRequest!=0? " --> WARNING":"")); + printf("# algos with missed ROB fragments during the prefetch: %d %s \n", n_missROSPrefetch, (n_missROSPrefetch!=0? " --> WARNING":"")); + printf("# algos with missed ROS requests during the prefetch: %d %s \n", n_missAllROSPrefetch, (n_missAllROSPrefetch!=0? " --> WARNING":"")); printf("\n"); if (n_missROSRequest || n_missAllROSRequest || n_missROSPrefetch || n_missAllROSPrefetc){ - printf("ERRORS Found\n"); + printf("WARNING Found in TrigTest_CheckMerg.C\n"); } }