aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2010-07-05 23:38:58 +0200
committerPeter Andersson <[email protected]>2010-07-06 02:44:27 +0200
commit311ed3490b2b9dc93433827a3941c14e40f41a2e (patch)
tree69bc946aa0a3677abde5d4d4acd75d007b96516f
parentab61ffca8dda3ae387e479bb5ef4f40bd22cc6e9 (diff)
downloadotp-311ed3490b2b9dc93433827a3941c14e40f41a2e.tar.gz
otp-311ed3490b2b9dc93433827a3941c14e40f41a2e.tar.bz2
otp-311ed3490b2b9dc93433827a3941c14e40f41a2e.zip
Fix bug that crashes common_test when running cover
-rw-r--r--lib/common_test/src/ct_framework.erl5
-rw-r--r--lib/common_test/src/ct_logs.erl4
-rw-r--r--lib/common_test/src/ct_util.erl10
3 files changed, 5 insertions, 14 deletions
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 4104115484..f2ca023cff 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -1247,9 +1247,8 @@ overview_html_header(TestName) ->
true ->
"";
false ->
- CTPath = ct_util:get_ct_root(),
- TileFile = filename:join(filename:join(filename:join(CTPath),
- "priv"),"tile1.jpg"),
+ CTPath = code:lib_dir(common_test),
+ TileFile = filename:join(filename:join(CTPath,"priv"),"tile1.jpg"),
" background=\"" ++ TileFile ++ "\""
end,
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index 004d0d2540..f8ae7202e6 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -1069,8 +1069,8 @@ body_tag() ->
"<body bgcolor=\"#FFFFFF\" text=\"#000000\" link=\"#0000FF\" "
"vlink=\"#800080\" alink=\"#FF0000\">\n";
false ->
- CTPath = ct_util:get_ct_root(),
- TileFile = filename:join(filename:join(filename:join(CTPath),"priv"),"tile1.jpg"),
+ CTPath = code:lib_dir(common_test),
+ TileFile = filename:join(filename:join(CTPath,"priv"),"tile1.jpg"),
"<body background=\"" ++ TileFile ++ "\" bgcolor=\"#FFFFFF\" text=\"#000000\" link=\"#0000FF\" "
"vlink=\"#800080\" alink=\"#FF0000\">\n"
end.
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index 86e1482eb0..0a434666fa 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -45,7 +45,7 @@
-export([get_mode/0, create_table/3, read_opts/0]).
--export([set_cwd/1, reset_cwd/0, get_ct_root/0]).
+-export([set_cwd/1, reset_cwd/0]).
-export([parse_table/1]).
@@ -620,14 +620,6 @@ get_testdir(Dir, _) ->
get_testdir(Dir, all).
%%%-----------------------------------------------------------------
-%%% @spec
-%%%
-%%% @doc
-get_ct_root() ->
- [_Ebin|CTPath] = lists:reverse(filename:split(filename:dirname(code:which(?MODULE)))),
- lists:reverse(CTPath).
-
-%%%-----------------------------------------------------------------
%%% @spec
%%%
%%% @doc