Changeset 19052

Timestamp:

01/29/15 10:13:44 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: changed position of 'starting' and 'finished' so that it does not fail on IdToName error

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• runme.m (modified) (3 diffs)
• runme.py (modified) (4 diffs)

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

@@ -129 +129 @@
 root=pwd;
 for id=test_ids,
+        disp(sprintf('%s%i%s','----------------starting:',id,'-----------------------'));
         try,
-
                 %Execute test
                 eval(['cd ' root ]);
+                id_string='N/A';
                 id_string=IdToName(id);
-                disp(sprintf('%s%i%s','----------------starting:',id,'-----------------------'));
                 eval(['test' num2str(id)]);
 
@@ -249 +249 @@
                         end
                 end
-                
-                disp(sprintf('%s%i%s','----------------finished:',id,'-----------------------'));
-
         catch me,
 
@@ -268 +265 @@
                         if(getfieldvalue(options,'stoponerror',0)), disp('STOP'); return; end
                 end
-                disp(sprintf('%s%i%s','----------------finished:',id,'-----------------------'));
         end
-end
+        disp(sprintf('%s%i%s','----------------finished:',id,'-----------------------'));
+end

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

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