Changeset 16713

Timestamp:

11/12/13 08:00:32 (11 years ago)

Author:

Eric.Larour

Message:

CHG: avoid python log processing if running exclusively in matlab

File:

• issm/trunk-jpl/jenkins/jenkins.sh (modified) (1 diff)

issm/trunk-jpl/jenkins/jenkins.sh

@@ -347 +347 @@
 juLogClean
 
-#number tests:
-numtests=`cat matlab_log.log  | grep "\-\-\-\-\-\-\-\-starting" | wc -l`
-testlist=`cat matlab_log.log  | grep "\-\-\-\-\-\-\-\-starting" | sed 's/----------------starting://g'  | sed 's/-//g'`
-
-#look through numtests:
-for i in `echo $testlist`
-do
-        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
-#}}}
+if [ $MATLAB_TEST -eq 1 ]; then
+        #number tests:
+        numtests=`cat matlab_log.log  | grep "\-\-\-\-\-\-\-\-starting" | wc -l`
+        testlist=`cat matlab_log.log  | grep "\-\-\-\-\-\-\-\-starting" | sed 's/----------------starting://g'  | sed 's/-//g'`
+
+        #look through numtests:
+        for i in `echo $testlist`
+        do
+                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
+        done
+fi
+if [ $PYTHON_TEST -eq 1 ]; then
+        #number tests:
+        numtests=`cat python_log.log  | grep "\-\-\-\-\-\-\-\-starting" | wc -l`
+        testlist=`cat python_log.log  | grep "\-\-\-\-\-\-\-\-starting" | sed 's/----------------starting://g'  | sed 's/-//g'`
+
+        #look through numtests:
+        for i in `echo $testlist`
+        do
+                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
+fi
+#}}}