File 0239-ct-Fix-surefire-logs-for-parallel-testcase... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0239-ct-Fix-surefire-logs-for-parallel-testcases.patch of Package erlang (Revision dcd1e7a9f13fcca568b5570b1faadc72)

Currently displaying revision dcd1e7a9f13fcca568b5570b1faadc72 , Show latest

From 4ea6d3d849d36af0d51c446185b1bccc11a2faad Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Fri, 14 Jan 2022 13:49:48 +0100
Subject: [PATCH 4/5] ct: Fix surefire logs for parallel testcases

---
 lib/common_test/src/cth_surefire.erl | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/common_test/src/cth_surefire.erl b/lib/common_test/src/cth_surefire.erl
index c556c90c91..0a9aec2aea 100644
--- a/lib/common_test/src/cth_surefire.erl
+++ b/lib/common_test/src/cth_surefire.erl
@@ -266,23 +266,29 @@ init_tc(State, Config) when is_list(Config) == false ->
     State#state{ timer = ?now, tc_log =  "" };
 init_tc(State, Config) ->
     State#state{ timer = ?now,
-		 tc_log =  proplists:get_value(tc_logfile, Config, [])}.
+		 tc_log = proplists:get_value(tc_logfile, Config, [])}.
 
 end_tc(Func, Config, Res, State) when is_atom(Func) ->
     end_tc(atom_to_list(Func), Config, Res, State);
+end_tc(Func, Config, Res, State = #state{ tc_log = "" }) ->
+    end_tc(Func, Config, Res, State#state{ tc_log = proplists:get_value(tc_logfile, Config) });
 end_tc(Name, _Config, _Res, State = #state{ curr_suite = Suite,
 					    curr_group = Groups,
 					    curr_log_dir = CurrLogDir,
 					    timer = TS,
-					    tc_log = Log0,
 					    url_base = UrlBase } ) ->
     Log =
-	case Log0 of
-	    "" ->
+	case State#state.tc_log of
+	    undefined ->
 		LowerSuiteName = string:lowercase(atom_to_list(Suite)),
-		filename:join(CurrLogDir,LowerSuiteName++"."++Name++".html");
-	    _ ->
-		Log0
+		case filelib:wildcard(filename:join(CurrLogDir,LowerSuiteName++"."++Name++".*html")) of
+                    [] ->
+                        "";
+                    [LogFile|_] ->
+                        LogFile
+                end;
+	    LogFile ->
+		LogFile
 	end,
     Url = make_url(UrlBase,Log),
     ClassName = atom_to_list(Suite),
-- 
2.31.1

Places

File 0239-ct-Fix-surefire-logs-for-parallel-testcases.patch of Package erlang (Revision dcd1e7a9f13fcca568b5570b1faadc72)

Places