Changeset 23830

Timestamp:

04/08/19 15:38:55 (6 years ago)

Author:

jdquinn

Message:

CHG: Testing better error parsing in Jenkins for Python tests

Location:

issm/trunk-jpl

Files:

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

issm/trunk-jpl/jenkins/jenkins.sh

@@ -382 +382 @@
 done
 fi
-
-# Check that Python did not exit in error
-exitedInError=`grep "Traceback" python_log.log | wc -l`
-
-if [ $exitedInError -ne 0 ]
-then
-        echo "----------Python exited in error!----------"
-        cat python_log.log
-        echo "-------------------------------------------"
-        exit 1
-fi
 # }}}
 
@@ -525 +514 @@
         done
 fi
+
+# Check that Python did not exit in error
+pythonExitedInError=`grep "Traceback" python_log.log | wc -l`
+
+if [ $pythonExitedInError -ne 0 ]
+then
+        echo "----------Python exited in error!----------"
+        cat python_log.log
+        echo "-----------End of python_log.log-----------"
+        exit 1
+else
+        echo "PYTHONEXITEDCORRECTLY"    
+fi
+
 if [ $EXAMPLES_TEST -eq 1 ];
 then

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

@@ -252 +252 @@
                 args = parser.parse_args()
 
-                md = runme([args.id, args.include_name], [args.exclude, args.exclude_name], args.benchmark, args.procedure, args.output, args.rank, args.numprocs)
-
-                if args.output == 'nightly':
-                        print("PYTHONEXITEDCORRECTLY")
+                md = runme([args.id, args.include_name], [args.exclude, args.exclude_name], args.benchmark, args.procedure, args.output, args.rank, args.numprocs
 
                 exit(md)
+    else:
+        print("PYTHONSTARTUP not defined in environment")
+        raise RuntimeError()