Force CT log cache to rescan entries with incomplete results

1 files changed, 16 insertions, 3 deletions

diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index a4ad65c0a4..7305328e92 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -1842,14 +1842,27 @@ dir_diff_all_runs(LogDirs=[Dir|Dirs], Cached=[CElem|CElems],
 		  LatestInCache, AllRunsDirs) ->
     DirDate = datestr_from_dirname(Dir),
     if DirDate > LatestInCache ->
-	    %% Dir is a new run entry
+	    %% Dir is a new run entry (not cached)
 	    dir_diff_all_runs(Dirs, Cached, LatestInCache,
 			      [Dir|AllRunsDirs]);  
        DirDate == LatestInCache, CElems /= [] ->
-	    %% Dir is an existing run entry
+	    %% Dir is an existing (cached) run entry
+
+	    %% Only add the cached element instead of Dir if the totals
+	    %% are "non-empty" (a test might be executing on a different
+	    %% node and results haven't been saved yet)
+	    ElemToAdd =
+		case CElem of
+		    {_CDir,{_NodeStr,_Label,_Logs,{0,0,0,0,0}},_IxLink} ->
+			%% "empty" element in cache - this could be an
+			%% incomplete test and should be checked again
+			Dir;
+		    _ ->
+			CElem
+		end,
 	    dir_diff_all_runs(Dirs, CElems,
 			      datestr_from_dirname(element(1,hd(CElems))),
-			      [CElem|AllRunsDirs]);
+			      [ElemToAdd|AllRunsDirs]);
        DirDate == LatestInCache, CElems == [] ->
 	    %% we're done, Dirs must all be new
 	    lists:reverse(Dirs)++[CElem|AllRunsDirs];