From 20339c15f8794a1bcffa27202393a44fdbb71ab5 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Mon, 16 May 2011 12:00:39 +0200
Subject: Update ts to propigate the timetrap factor gotten from
 test_server:timetrap_scale_factor to common test when starting a test run.

---
 lib/test_server/src/ts_run.erl | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/test_server/src/ts_run.erl b/lib/test_server/src/ts_run.erl
index d145290820..885a3c9b96 100644
--- a/lib/test_server/src/ts_run.erl
+++ b/lib/test_server/src/ts_run.erl
@@ -365,6 +365,14 @@ make_common_test_args(Args0, Options, _Vars) ->
 		      [{logdir,"../test_server"}]
 	     end,
 
+    TimeTrap = case test_server:timetrap_scale_factor() of
+		   1 ->
+		       [];
+		   Scale ->
+		       [{multiply_timetraps, Scale},
+			{scale_timetraps, true}]
+	       end,
+
     ConfigPath = case {os:getenv("TEST_CONFIG_PATH"),
 		       lists:keysearch(config, 1, Options)} of
 		     {false,{value, {config, Path}}} ->
@@ -377,7 +385,7 @@ make_common_test_args(Args0, Options, _Vars) ->
     ConfigFiles = [{config,[filename:join(ConfigPath,File)
 			    || File <- get_config_files()]}],
     io_lib:format("~100000p",[Args0++Trace++Cover++Logdir++
-				  ConfigFiles++Options]).
+				  ConfigFiles++Options++TimeTrap]).
 
 to_list(X) when is_atom(X) ->
     atom_to_list(X);
-- 
cgit v1.2.3