diff --git a/Code/Mantid/LinuxBuildScripts/RunTests.sh b/Code/Mantid/LinuxBuildScripts/RunTests.sh index 5aaf4ced488106b142389b6ec7c89e97a901515b..049618feea40cd18f3f9bac9362f43c68af49e10 100644 --- a/Code/Mantid/LinuxBuildScripts/RunTests.sh +++ b/Code/Mantid/LinuxBuildScripts/RunTests.sh @@ -1,8 +1,10 @@ rm ../logs/testsBuild.log rm ../logs/testsBuildErr.log rm ../logs/testResults.log +rm ../logs/testsRunErr.log cd ../checkout/Build/Tests pwd scons >> ../../../logs/testsBuild.log 2> ../../../logs/testsBuildErr.log python ../../LinuxBuildScripts/doTests.py +sh TestsScript.sh 2> ../../../logs/testsRunErr.log diff --git a/Code/Mantid/LinuxBuildScripts/doTests.py b/Code/Mantid/LinuxBuildScripts/doTests.py index 8ae3077c9f5c2c41798f5de4465478c88c2b3919..d87b476b1590bb5faf47805a058e990c7eed90c9 100644 --- a/Code/Mantid/LinuxBuildScripts/doTests.py +++ b/Code/Mantid/LinuxBuildScripts/doTests.py @@ -1,14 +1,15 @@ import os -print os.getcwd() - f=open('../TestsToRun', 'r') +g=open('TestsScript.sh', 'w') + for test in f: name = test.split('/') - os.popen('echo ' + name[-1].strip().rstrip('.h') + ' >> ../../../logs/testResults.log') - os.popen('./' + name[-1].strip().rstrip('.h') + ' >> ../../../logs/testResults.log') - os.popen('rm ./' + name[-1].strip().rstrip('.h') + '.cpp') + g.write('echo ' + name[-1].strip().rstrip('.h') + ' >> ../../../logs/testResults.log\n') + g.write('./' + name[-1].strip().rstrip('.h') + ' >> ../../../logs/testResults.log\n') + g.write('rm ./' + name[-1].strip().rstrip('.h') + '.cpp\n') - +f.close() +g.close() diff --git a/Code/Mantid/LinuxBuildScripts/sendStatusEmail.py b/Code/Mantid/LinuxBuildScripts/sendStatusEmail.py index c357e6271d50c31a7752d7f933a49abe621ebbfe..0ef606ef4423160c4746966e3998566a43995131 100644 --- a/Code/Mantid/LinuxBuildScripts/sendStatusEmail.py +++ b/Code/Mantid/LinuxBuildScripts/sendStatusEmail.py @@ -19,6 +19,7 @@ mssgScons = '' mssgSconsErr = '' mssgTestsBuild = '' mssgTestsErr = '' +mssgTestsRunErr = '' mssgTestsResults = '' mssgSvn = '' mssgDoxy = '' @@ -51,19 +52,27 @@ if testsResult.startswith('scons: done building targets.'): mssgTestsErr = open('../logs/testsBuildErr.log','r').read() +f = open('../logs/testsRunErr.log','r') + +for line in f.readlines(): + temp = line + if temp.startswith('TestsScript.sh:'): + testsBuildSuccess = False + mssgTestsRunErr = mssgTestsRunErr + temp[0:temp.find('>>')] + '\n' + +f.close() + #Get tests result f = open('../logs/testResults.log','r') for line in f.readlines(): - print line - if line.startswith('Failed ') != -1 and line.endswith(' test\n'): + if line.startswith('Failed ') != -1 and line.endswith(' tests\n'): #A test failed testsPass = False mssgTestsResults = mssgTestsResults + line f.close() - #Read svn log mssgSvn = open('../logs/svn.log','r').read() @@ -84,6 +93,7 @@ message += '-------------------------------------------------------------------- message += 'TESTS BUILD LOG\n\n' message += mssgTestsBuild + "\n\n" message += mssgTestsErr + "\n" +message += mssgTestsRunErr + "\n" message += '------------------------------------------------------------------------\n' message += 'UNIT TEST LOG\n\n' message += mssgTestsResults + "\n"