diff options
| author | Peter Andersson <[email protected]> | 2015-02-23 11:16:15 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2015-02-23 11:16:15 +0100 |
| commit | 32b790573fe3cc9ba3f9b0d66e1832f36094034b (patch) | |
| tree | c845ae420f063da1e46666748d8da6d540dedb02 /lib/test_server/src/test_server_ctrl.erl | |
| parent | d7e9dfbc8869089a56a9a28f2c23d211f5bc31d9 (diff) | |
| parent | 121b920ed5a729e69e21d8869d554d736c10f427 (diff) | |
| download | otp-32b790573fe3cc9ba3f9b0d66e1832f36094034b.tar.gz otp-32b790573fe3cc9ba3f9b0d66e1832f36094034b.tar.bz2 otp-32b790573fe3cc9ba3f9b0d66e1832f36094034b.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/test_server/src/test_server_ctrl.erl')
| -rw-r--r-- | lib/test_server/src/test_server_ctrl.erl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl index af8921fe75..488f38d05d 100644 --- a/lib/test_server/src/test_server_ctrl.erl +++ b/lib/test_server/src/test_server_ctrl.erl @@ -1927,15 +1927,20 @@ html_possibly_convert(Src, SrcInfo, Dest) -> {ok,DestInfo} when DestInfo#file_info.mtime >= SrcInfo#file_info.mtime -> ok; % dest file up to date _ -> + InclPath = case application:get_env(test_server, include) of + {ok,Incls} -> Incls; + _ -> [] + end, + OutDir = get(test_server_log_dir_base), case test_server_sup:framework_call(get_html_wrapper, ["Module "++Src,false, OutDir,undefined, encoding(Src)], "") of Empty when (Empty == "") ; (element(2,Empty) == "") -> - erl2html2:convert(Src, Dest); + erl2html2:convert(Src, Dest, InclPath); {_,Header,_} -> - erl2html2:convert(Src, Dest, Header) + erl2html2:convert(Src, Dest, InclPath, Header) end end. |