Changeset 16709

Timestamp:

11/11/13 22:11:41 (11 years ago)

Author:

Eric.Larour

Message:

CHG: get jenkins to do the logs nicely for python. Modify runme.py to display markers for each test.

Location:

issm/trunk-jpl

Files:

• jenkins/jenkins.sh (modified) (1 diff)
• test/NightlyRun/runme.py (modified) (3 diffs)

issm/trunk-jpl/jenkins/jenkins.sh

@@ -354 +354 @@
 for i in `echo $testlist`
 do
-        juLog  -test=$i -name=Matlab.Error -error=ERROR awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" matlab_log.log
-        juLog  -test=$i -name=Matlab.Failure -error=FAILURE awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" matlab_log.log
-        juLog  -test=$i -name=Python.Error -error=ERROR awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" python_log.log
-        juLog  -test=$i -name=Python.Failure -error=FAILURE awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" python_log.log
-
-done
-#}}}
+        juLog  -test=MATLAB-$i -name=Error -error=ERROR awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" matlab_log.log
+        juLog  -test=MATLAB-$i -name=Failure -error=FAILURE awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" matlab_log.log
+        juLog  -test=PYTHON-$i -name=Error -error=ERROR awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" python_log.log
+        juLog  -test=PYTHON-$i -name=Failure -error=FAILURE awk "/starting:$i/{flag=1;next}/finished/{flag=0} flag{print}" python_log.log
+done
+#}}}

issm/trunk-jpl/test/NightlyRun/runme.py

@@ -135 +135 @@
                         os.chdir(root)
                         id_string=IdToName(id)
+                        print "----------------starting:%i-----------------------" % id
                         execfile('test'+str(id)+'.py',globals())
 
@@ -220 +221 @@
 
                                 f.close()
+                                printf "----------------finished:%i-----------------------" % id
 
                 except Exception as me:
@@ -241 +243 @@
                                 print 'FAILURE difference: N/A test id: %i test name: %s field: %s' % (id,id_string,'N/A')
                                 raise RuntimeError(me)
+                        printf "----------------finished:%i-----------------------" % id
 
         return