From c2a3647e471bb08de24d867bc7c3f541e2f7a15d Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Tue, 20 Mar 2012 01:29:02 +0100
Subject: Implement support for user controlled timetraps

OTP-9988
---
 lib/common_test/src/ct.erl           | 14 +++++++++++---
 lib/common_test/src/ct_framework.erl |  6 +++---
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'lib/common_test/src')

diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 63a8adbc63..296416737f 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -993,13 +993,21 @@ remove_config(Callback, Config) ->
 
 %%%-----------------------------------------------------------------
 %%% @spec timetrap(Time) -> ok
-%%%       Time = {hours,Hours} | {minutes,Mins} | {seconds,Secs} | Millisecs | infinity
+%%%       Time = {hours,Hours} | {minutes,Mins} | {seconds,Secs} | Millisecs | infinity | Func
 %%%       Hours = integer()
 %%%       Mins = integer()
 %%%       Secs = integer()
 %%%       Millisecs = integer() | float()
-%%%
-%%% @doc <p>Use this function to set a new timetrap for the running test case.</p>
+%%%       Func = {M,F,A} | fun()
+%%%       M = atom()
+%%%       F = atom()
+%%%       A = list()
+%%%
+%%% @doc <p>Use this function to set a new timetrap for the running test case.
+%%%      If the argument is <code>Func</code>, the timetrap will be triggered
+%%%      when this function returns. <code>Func</code> may also return a new
+%%%      <code>Time</code> value, which in that case will be the value for the
+%%%      new timetrap.</p>
 timetrap(Time) ->
     test_server:timetrap_cancel(),
     test_server:timetrap(Time).
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 187794e78b..c8aff3c039 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -212,7 +212,7 @@ init_tc2(Mod,Suite,Func,SuiteInfo,MergeResult,Config) ->
 	    {auto_skip,{require_failed,Reason}};
 	{'EXIT',Reason} ->
 	    {auto_skip,Reason};
-	{ok,FinalConfig} ->
+	{ok,Config1} ->
 	    case MergeResult of
 		{error,Reason} ->
 		    %% suite0 configure finished now, report that 
@@ -221,9 +221,9 @@ init_tc2(Mod,Suite,Func,SuiteInfo,MergeResult,Config) ->
 		_ ->
 		    case get('$test_server_framework_test') of
 			undefined ->
-			    ct_suite_init(Suite, FuncSpec, FinalConfig);
+			    ct_suite_init(Mod, FuncSpec, Config1);
 			Fun ->
-			    case Fun(init_tc, FinalConfig) of
+			    case Fun(init_tc, Config1) of
 				NewConfig when is_list(NewConfig) ->
 				    {ok,NewConfig};
 				Else ->
-- 
cgit v1.2.3


From 07481665da8b71ce75e70eca62f8b980179d360c Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Wed, 21 Mar 2012 12:01:37 +0100
Subject: Fix dialyzer reported errors

---
 lib/common_test/src/ct_framework.erl | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

(limited to 'lib/common_test/src')

diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 187794e78b..1ed707fcb0 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -213,22 +213,15 @@ init_tc2(Mod,Suite,Func,SuiteInfo,MergeResult,Config) ->
 	{'EXIT',Reason} ->
 	    {auto_skip,Reason};
 	{ok,FinalConfig} ->
-	    case MergeResult of
-		{error,Reason} ->
-		    %% suite0 configure finished now, report that 
-		    %% first test case actually failed		    
-		    {skip,Reason};
-		_ ->
-		    case get('$test_server_framework_test') of
-			undefined ->
-			    ct_suite_init(Suite, FuncSpec, FinalConfig);
-			Fun ->
-			    case Fun(init_tc, FinalConfig) of
-				NewConfig when is_list(NewConfig) ->
-				    {ok,NewConfig};
-				Else ->
-				    Else
-			    end
+	    case get('$test_server_framework_test') of
+		undefined ->
+		    ct_suite_init(Suite, FuncSpec, FinalConfig);
+		Fun ->
+		    case Fun(init_tc, FinalConfig) of
+			NewConfig when is_list(NewConfig) ->
+			    {ok,NewConfig};
+			Else ->
+			    Else
 		    end
 	    end
     end.
@@ -346,16 +339,12 @@ get_suite_name(Mod, _) ->
     Mod.
 
 %% Check that alias names are not already in use
-check_for_clashes(TCInfo, GrPathInfo, SuiteInfo) ->
-    {CurrGrInfo,SearchIn} = case GrPathInfo of
-				[] -> {[],[SuiteInfo]};
-				[Curr|Path] -> {Curr,[SuiteInfo|Path]}
-			    end,
+check_for_clashes(TCInfo, [CurrGrInfo|Path], SuiteInfo) ->
     ReqNames = fun(Info) -> [element(2,R) || R <- Info,
 					     size(R) == 3,
 					     require == element(1,R)]
 	       end,
-    ExistingNames = lists:flatten([ReqNames(L)  || L <- SearchIn]),
+    ExistingNames = lists:flatten([ReqNames(L)  || L <- [SuiteInfo|Path]]),
     CurrGrReqNs = ReqNames(CurrGrInfo),
     GrClashes = [Name || Name <- CurrGrReqNs,
 			 true == lists:member(Name, ExistingNames)],
-- 
cgit v1.2.3


From 390843117229d7d6e1e5f167aca9ea2ebe6df5f2 Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Wed, 21 Mar 2012 16:03:46 +0100
Subject: Update ct_master to use the Common Test CSS file for the logs

OTP-9973
---
 lib/common_test/src/ct_logs.erl        |  25 ++---
 lib/common_test/src/ct_master.erl      |  13 ++-
 lib/common_test/src/ct_master_logs.erl | 175 +++++++++++++++++++++------------
 3 files changed, 137 insertions(+), 76 deletions(-)

(limited to 'lib/common_test/src')

diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index 0cd9b5f7cb..012f947fdd 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -36,6 +36,7 @@
 -export([make_last_run_index/0]).
 -export([make_all_suites_index/1,make_all_runs_index/1]).
 -export([get_ts_html_wrapper/3]).
+-export([xhtml/2, locate_default_css_file/0, make_relative/1]).
 
 %% Logging stuff directly from testcase
 -export([tc_log/3,tc_log/4,tc_log_async/3,tc_print/3,tc_pal/3,ct_log/3,
@@ -1246,18 +1247,18 @@ header1(Title, SubTitle) ->
 	   ["<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n",
 	    "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n",
 	    "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n"]),
-    "<!-- autogenerated by '"++atom_to_list(?MODULE)++"' -->\n",
-    "<head>\n",
-    "<title>" ++ Title ++ " " ++ SubTitle ++ "</title>\n",
-    "<meta http-equiv=\"cache-control\" content=\"no-cache\">\n",
-    xhtml("",
-	  ["<link rel=\"stylesheet\" href=\"",CSSFile,"\" type=\"text/css\">"]),
-    "</head>\n",
-    body_tag(),
-    "<center>\n",
-    "<h1>" ++ Title ++ "</h1>\n",
-    "</center>\n",
-    SubTitleHTML,"\n"].
+     "<!-- autogenerated by '"++atom_to_list(?MODULE)++"' -->\n",
+     "<head>\n",
+     "<title>" ++ Title ++ " " ++ SubTitle ++ "</title>\n",
+     "<meta http-equiv=\"cache-control\" content=\"no-cache\">\n",
+     xhtml("",
+	   ["<link rel=\"stylesheet\" href=\"",CSSFile,"\" type=\"text/css\">"]),
+     "</head>\n",
+     body_tag(),
+     "<center>\n",
+     "<h1>" ++ Title ++ "</h1>\n",
+     "</center>\n",
+     SubTitleHTML,"\n"].
 
 index_footer() ->
     ["</table>\n"
diff --git a/lib/common_test/src/ct_master.erl b/lib/common_test/src/ct_master.erl
index 2ea2ba106a..0d32bb0072 100644
--- a/lib/common_test/src/ct_master.erl
+++ b/lib/common_test/src/ct_master.erl
@@ -25,6 +25,7 @@
 -export([run/1,run/3,run/4]).
 -export([run_on_node/2,run_on_node/3]).
 -export([run_test/1,run_test/2]).
+-export([basic_html/1]).
 
 -export([abort/0,abort/1,progress/0]).
 
@@ -277,7 +278,17 @@ abort(Node) when is_atom(Node) ->
 progress() ->
     call(progress).
 
-		
+%%%-----------------------------------------------------------------
+%%% @spec basic_html(Bool) -> ok
+%%%       Bool = true | false
+%%%
+%%% @doc If set to true, the ct_master logs will be written on a
+%%%      primitive html format, not using the Common Test CSS style
+%%%      sheet.
+basic_html(Bool) ->
+    application:set_env(common_test_master, basic_html, Bool),
+    ok.
+
 %%%-----------------------------------------------------------------
 %%% MASTER, runs on central controlling node.
 %%%-----------------------------------------------------------------
diff --git a/lib/common_test/src/ct_master_logs.erl b/lib/common_test/src/ct_master_logs.erl
index 244faace06..8fd346670f 100644
--- a/lib/common_test/src/ct_master_logs.erl
+++ b/lib/common_test/src/ct_master_logs.erl
@@ -23,7 +23,8 @@
 %%% node.</p>
 -module(ct_master_logs).
 
--export([start/2, make_all_runs_index/0, log/3, nodedir/2, stop/0]).
+-export([start/2, make_all_runs_index/0, log/3, nodedir/2,
+	 stop/0]).
 
 -record(state, {log_fd, start_time, logdir, rundir, 
 		nodedir_ix_fd, nodes, nodedirs=[]}).
@@ -32,6 +33,7 @@
 -define(all_runs_name, "master_runs.html").
 -define(nodedir_index_name, "index.html").
 -define(details_file_name,"details.info").
+-define(css_default, "ct_default.css").
 -define(table_color,"lightblue").
 
 %%%--------------------------------------------------------------------
@@ -87,6 +89,40 @@ init(Parent,LogDir,Nodes) ->
     RunDirAbs = filename:join(LogDir,RunDir),
     file:make_dir(RunDirAbs),
     write_details_file(RunDirAbs,{node(),Nodes}),
+
+    case basic_html() of
+	true ->
+	    put(basic_html, true);
+	BasicHtml ->
+	    put(basic_html, BasicHtml),
+	    %% copy stylesheet to log dir (both top dir and test run
+	    %% dir) so logs are independent of Common Test installation
+	    CTPath = code:lib_dir(common_test),
+	    CSSFileSrc = filename:join(filename:join(CTPath, "priv"),
+				       ?css_default),
+	    CSSFileDestTop = filename:join(LogDir, ?css_default),
+	    CSSFileDestRun = filename:join(RunDirAbs, ?css_default),
+	    case file:copy(CSSFileSrc, CSSFileDestTop) of
+		{error,Reason0} ->
+		    io:format(user, "ERROR! "++
+			      "CSS file ~p could not be copied to ~p. "++
+			      "Reason: ~p~n",
+			      [CSSFileSrc,CSSFileDestTop,Reason0]),
+		    exit({css_file_error,CSSFileDestTop});
+		_ ->
+		    case file:copy(CSSFileSrc, CSSFileDestRun) of
+			{error,Reason1} ->
+			    io:format(user, "ERROR! "++
+				      "CSS file ~p could not be copied to ~p. "++
+				      "Reason: ~p~n",
+				      [CSSFileSrc,CSSFileDestRun,Reason1]),
+			    exit({css_file_error,CSSFileDestRun});
+			_ ->
+			    ok
+		    end
+	    end
+    end,
+
     make_all_runs_index(LogDir),
     CtLogFd = open_ct_master_log(RunDirAbs),
     NodeStr = 
@@ -164,8 +200,9 @@ open_ct_master_log(Dir) ->
 	      "</style>\n",
 	      []),
     io:format(Fd, 
-	      "<br><h2>Progress Log</h2>\n"
-	      "<pre>\n",[]),
+	      xhtml("<br><h2>Progress Log</h2>\n<pre>\n",
+		    "<br /><h2>Progress Log</h2>\n<pre>\n"),
+	      []),
     Fd.
 
 close_ct_master_log(Fd) ->
@@ -178,18 +215,10 @@ config_table(Vars) ->
 
 config_table_header() ->
     ["<h2>Configuration</h2>\n",
-     "<table border=\"3\" cellpadding=\"5\" bgcolor=\"",?table_color,
-     "\"\n",
+     xhtml(["<table border=\"3\" cellpadding=\"5\" "
+	    "bgcolor=\"",?table_color,"\"\n"], "<table>\n"),
      "<tr><th>Key</th><th>Value</th></tr>\n"].
 
-%%
-%% keep for possible later use
-%%
-%%config_table1([{Key,Value}|Vars]) ->
-%%    ["<tr><td>", atom_to_list(Key), "</td>\n",
-%%     "<td><pre>",io_lib:format("~p",[Value]),"</pre></td></tr>\n" | 
-%%     config_table1(Vars)];
-
 config_table1([]) ->
     ["</table>\n"].
 
@@ -210,10 +239,10 @@ open_nodedir_index(Dir,StartTime) ->
 print_nodedir(Node,RunDir,Fd) ->
     Index = filename:join(RunDir,"index.html"),
     io:format(Fd,
-	      ["<TR>\n"
-	       "<TD ALIGN=center>",atom_to_list(Node),"</TD>\n",
-	       "<TD ALIGN=left><A HREF=\"",Index,"\">",Index,"</A></TD>\n",
-	       "</TR>\n"],[]),
+	      ["<tr>\n"
+	       "<td align=center>",atom_to_list(Node),"</td>\n",
+	       "<td align=left><a href=\"",Index,"\">",Index,"</a></td>\n",
+	       "</tr>\n"],[]),
     ok.
 
 close_nodedir_index(Fd) ->
@@ -222,12 +251,12 @@ close_nodedir_index(Fd) ->
 
 nodedir_index_header(StartTime) ->
     [header("Log Files " ++ format_time(StartTime)) |
-     ["<CENTER>\n",
-      "<P><A HREF=\"",?ct_master_log_name,"\">Common Test Master Log</A></P>",
-      "<TABLE border=\"3\" cellpadding=\"5\" ",
-      "BGCOLOR=\"",?table_color,"\">\n",
-      "<th><B>Node</B></th>\n",
-      "<th><B>Log</B></th>\n",
+     ["<center>\n",
+      "<p><a href=\"",?ct_master_log_name,"\">Common Test Master Log</a></p>",
+      xhtml(["<table border=\"3\" cellpadding=\"5\" "
+	     "bgcolor=\"",?table_color,"\">\n"], "<table>\n"),
+      "<th><b>Node</b></th>\n",
+      "<th><b>Log</b></th>\n",
       "\n"]].
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -279,20 +308,20 @@ runentry(Dir) ->
 		{"unknown",""}
 	end,
     Index = filename:join(Dir,?nodedir_index_name),
-    ["<TR>\n"
-     "<TD ALIGN=center><A HREF=\"",Index,"\">",timestamp(Dir),"</A></TD>\n",
-     "<TD ALIGN=center>",MasterStr,"</TD>\n",
-     "<TD ALIGN=center>",NodesStr,"</TD>\n",
-     "</TR>\n"].
+    ["<tr>\n"
+     "<td align=center><a href=\"",Index,"\">",timestamp(Dir),"</a></td>\n",
+     "<td align=center>",MasterStr,"</td>\n",
+     "<td align=center>",NodesStr,"</td>\n",
+     "</tr>\n"].
 
 all_runs_header() ->
     [header("Master Test Runs") |
-     ["<CENTER>\n",
-      "<TABLE border=\"3\" cellpadding=\"5\" "
-      "BGCOLOR=\"",?table_color,"\">\n"
-      "<th><B>History</B></th>\n"
-      "<th><B>Master Host</B></th>\n"
-      "<th><B>Test Nodes</B></th>\n"
+     ["<center>\n",
+      xhtml(["<table border=\"3\" cellpadding=\"5\" "
+	     "bgcolor=\"",?table_color,"\">\n"], "<table>\n"),
+      "<th><b>History</b></th>\n"
+      "<th><b>Master Host</b></th>\n"
+      "<th><b>Test Nodes</b></th>\n"
       "\n"]].
 
 timestamp(Dir) ->
@@ -318,44 +347,46 @@ read_details_file(Dir) ->
 %%%--------------------------------------------------------------------
 
 header(Title) ->
-    ["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n"
-     "<!-- autogenerated by '"++atom_to_list(?MODULE)++"'. -->\n"
-     "<HTML>\n",
-     "<HEAD>\n",
-
-     "<TITLE>" ++ Title ++ "</TITLE>\n",
-     "<META HTTP-EQUIV=\"CACHE-CONTROL\" CONTENT=\"NO-CACHE\">\n",
-
-     "</HEAD>\n",
-
+    CSSFile = xhtml(fun() -> "" end, 
+		    fun() -> make_relative(locate_default_css_file()) end),
+    [xhtml(["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n",
+	    "<html>\n"],
+	   ["<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n",
+	    "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n",
+	    "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n"]),
+     "<!-- autogenerated by '"++atom_to_list(?MODULE)++"' -->\n",
+     "<head>\n",
+     "<title>" ++ Title ++ "</title>\n",
+     "<meta http-equiv=\"cache-control\" content=\"no-cache\">\n",
+     xhtml("",
+	   ["<link rel=\"stylesheet\" href=\"",CSSFile,"\" type=\"text/css\">"]),
+     "</head>\n",
      body_tag(),
-
-     "<!-- ---- DOCUMENT TITLE  ---- -->\n",
-
-     "<CENTER>\n",
-     "<H1>" ++ Title ++ "</H1>\n",
-     "</CENTER>\n",
-
-     "<!-- ---- CONTENT ---- -->\n"].
+     "<center>\n",
+     "<h1>" ++ Title ++ "</h1>\n",
+     "</center>\n"].
 
 index_footer() ->
-    ["</TABLE>\n"
-     "</CENTER>\n" | footer()].
+    ["</table>\n"
+     "</center>\n" | footer()].
 
 footer() ->
-     ["<P><CENTER>\n"
-     "<HR>\n"
-     "<P><FONT SIZE=-1>\n"
+    ["<center>\n",
+     xhtml("<br><hr>\n", "<br />\n"),
+     xhtml("<p><font size=\"-1\">\n", "<div class=\"copyright\">"),
      "Copyright &copy; ", year(),
-     " <A HREF=\"http://erlang.ericsson.se\">Open Telecom Platform</A><BR>\n"
-     "Updated: <!date>", current_time(), "<!/date><BR>\n"
-     "</FONT>\n"
-     "</CENTER>\n"
+     " <a href=\"http://www.erlang.org\">Open Telecom Platform</a>",
+     xhtml("<br>\n", "<br />\n"),
+     "Updated: <!date>", current_time(), "<!/date>",
+     xhtml("<br>\n", "<br />\n"),
+     xhtml("</font></p>\n", "</div>\n"),
+     "</center>\n"
      "</body>\n"].
 
 body_tag() ->
-    "<body bgcolor=\"#FFFFFF\" text=\"#000000\" link=\"#0000FF\""
-	"vlink=\"#800080\" alink=\"#FF0000\">\n".
+    xhtml("<body bgcolor=\"#FFFFFF\" text=\"#000000\" link=\"#0000FF\" "
+	  "vlink=\"#800080\" alink=\"#FF0000\">\n",
+	  "<body>\n").
 
 current_time() ->
     format_time(calendar:local_time()).
@@ -404,6 +435,23 @@ log_timestamp(Now) ->
     lists:flatten(io_lib:format("~2.2.0w:~2.2.0w:~2.2.0w",
 				[H,M,S])).
 
+basic_html() ->
+    case application:get_env(common_test_master, basic_html) of
+	{ok,true} ->
+	    true;
+	_ ->
+	    false
+    end.
+
+xhtml(HTML, XHTML) ->
+    ct_logs:xhtml(HTML, XHTML).
+
+locate_default_css_file() ->
+    ct_logs:locate_default_css_file().
+
+make_relative(Dir) ->
+    ct_logs:make_relative(Dir).
+
 force_write_file(Name,Contents) ->
     force_delete(Name),
     file:write_file(Name,Contents).
@@ -452,3 +500,4 @@ cast(Msg) ->
 	_Pid ->
 	    ?MODULE ! Msg
     end.
+
-- 
cgit v1.2.3


From c75d6ef4e32affebd6e5a3a03bbbb18532940030 Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Wed, 21 Mar 2012 18:09:30 +0100
Subject: Document the create_priv_dir option for ct:run_test/1

---
 lib/common_test/src/ct.erl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/common_test/src')

diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 63a8adbc63..68ddce8068 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -146,7 +146,8 @@ run(TestDirs) ->
 %%%               {silent_connections,Conns} | {stylesheet,CSSFile} |
 %%%               {cover,CoverSpecFile} | {step,StepOpts} |
 %%%               {event_handler,EventHandlers} | {include,InclDirs} |
-%%%               {auto_compile,Bool} | {multiply_timetraps,M} | {scale_timetraps,Bool} |
+%%%               {auto_compile,Bool} | {create_priv_dir,CreatePrivDir}  |
+%%%               {multiply_timetraps,M} | {scale_timetraps,Bool} |
 %%%               {repeat,N} | {duration,DurTime} | {until,StopTime} |
 %%%               {force_stop,Bool} | {decrypt,DecryptKeyOrFile} |
 %%%               {refresh_logs,LogDir} | {logopts,LogOpts} | {basic_html,Bool} | 
@@ -171,6 +172,7 @@ run(TestDirs) ->
 %%%   EH = atom() | {atom(),InitArgs} | {[atom()],InitArgs}
 %%%   InitArgs = [term()]
 %%%   InclDirs = [string()] | string()
+%%%   CreatePrivDir = auto_per_run | auto_per_tc | manual_per_tc
 %%%   M = integer()
 %%%   N = integer()
 %%%   DurTime = string(HHMMSS)
-- 
cgit v1.2.3