From 73d5855c69b66c7cd861c2dab51d67a6434d4ef2 Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Tue, 16 Apr 2013 23:59:46 -0400 Subject: [PATCH] #3752 fail=N pass=N for fractal tree tests refs[t:3752] git-svn-id: file:///svn/toku/tokudb@33807 c7de825b-a66e-492c-adef-691d508d4ae1 --- scripts/build.check.bash | 6 ++++-- scripts/build.check.icc.bash | 7 +++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/build.check.bash b/scripts/build.check.bash index 6f5a392e34c..1a4c02fc48a 100755 --- a/scripts/build.check.bash +++ b/scripts/build.check.bash @@ -87,6 +87,7 @@ function runcmd() { if [ $fail -eq 0 ] ; then if [ $exitcode -eq 0 ] ; then result="PASS `mydate` $dir $cmd" + let npass=npass+1 else result="FAIL `mydate` $dir $cmd" let nfail=nfail+1 @@ -172,6 +173,7 @@ function build() { mkdir -p $productbuilddir let nfail=0 + let npass=0 # checkout into $productbuilddir runcmd 0 $productbuilddir retry svn checkout -q -r $revision $svnserver/$checkout . >>$tracefile 2>&1 @@ -273,8 +275,8 @@ function build() { # put the trace into svn if [ $docommit -ne 0 ] ; then - testresult="PASS" - if [ $nfail -ne 0 ] ; then testresult="FAIL=$nfail"; fi + testresult="PASS=$npass" + if [ $nfail -ne 0 ] ; then testresult="FAIL=$nfail $testresult"; fi local cf=`mktemp` echo "$testresult tokudb-build $productname-$BDB $system $release $arch $nodename" >$cf diff --git a/scripts/build.check.icc.bash b/scripts/build.check.icc.bash index 65fd826418e..42907a323f9 100755 --- a/scripts/build.check.icc.bash +++ b/scripts/build.check.icc.bash @@ -267,10 +267,9 @@ function build() { # put the trace into svn if [ $docommit -ne 0 ] ; then - if [ $nfail = 0 ] ; then - testresult="PASS=$npass" - else - testresult="FAIL=$nfail PASS=$npass" + testresult="PASS=$npass" + if [ $nfail != 0 ] ; then + testresult="FAIL=$nfail $testresult" fi local cf=`mktemp`