Changeset 15725

Timestamp:

08/06/13 11:33:09 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added check on conditional jumps

File:

• issm/trunk-jpl/test/NightlyRun/runme.m (modified) (1 diff)

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

@@ -159 +159 @@
                                         disp(['Extracting results of ' fields{i}]);
                                 end
-                                errlog = cellstr(md.results.(fields{i}).errlog);
-                                lines  = strfind(errlog,'definitely lost:');
-                                lines  = find(~cellfun(@isempty,lines));
-                                total  = 0;
-                                for j=1:numel(lines)
-                                        Line    = errlog(lines(j));
+                                results = md.results.(fields{i});
+                                errlog  = cellstr(results(1).errlog);
+                                lines1  = strfind(errlog,'definitely lost:');
+                                lines1  = find(~cellfun(@isempty,lines1));
+                                lines2  = strfind(errlog,'Conditional jump or move depends on uninitialised value');
+                                lines2  = find(~cellfun(@isempty,lines2));
+                                jumps   = numel(lines2);
+                                leaks   = 0;
+                                for j=1:numel(lines1)
+                                        Line    = errlog(lines1(j));
                                         Numbers = sscanf(Line{1},'==%i==   definitely lost: %s bytes in %i blocks',[1 Inf]);
-                                        total   = total+ str2num(strrep(char(Numbers(2:end-1)),',',''));
-                                end
-                                if total==0,
-                                        disp(sprintf(['SUCCESS difference: 0 < 0 test id: %i test name: %s field: valgrind'],id,id_string));
+                                        leaks   = leaks + str2num(strrep(char(Numbers(2:end-1)),',',''));
+                                end
+                                if leaks==0,
+                                        disp(sprintf(['SUCCESS difference: 0 < 0 test id: %i test name: %s field: valgrindleaks'],id,id_string));
                                 else
-                                        disp(sprintf(['ERROR   difference: %i > 0 test id: %i test name: %s field: valgrind'],total,id,id_string));
+                                        disp(sprintf(['ERROR   difference: %i > 0 test id: %i test name: %s field: valgrindleaks'],leaks,id,id_string));
+                                        disp('STOP');
+                                        return;
+                                end
+                                if jumps==0,
+                                        disp(sprintf(['SUCCESS difference: 0 < 0 test id: %i test name: %s field: valgrindjumps'],id,id_string));
+                                else
+                                        disp(sprintf(['ERROR   difference: %i > 0 test id: %i test name: %s field: valgrindjumps'],jumps,id,id_string));
                                         disp('STOP');
                                         return;