diff options
| author | Peter Andersson <[email protected]> | 2015-02-23 11:12:03 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2015-02-23 11:12:03 +0100 |
| commit | 121b920ed5a729e69e21d8869d554d736c10f427 (patch) | |
| tree | c74c92116c9a1aeaf6ca34d27859fb5ffda3fcb2 /lib/test_server/test | |
| parent | 9741d1c9cdcce08ec7a0c5c91ab6e1af781ed745 (diff) | |
| parent | daa3c46d80435b0b790911095b34dc7255b3a6b8 (diff) | |
| download | otp-121b920ed5a729e69e21d8869d554d736c10f427.tar.gz otp-121b920ed5a729e69e21d8869d554d736c10f427.tar.bz2 otp-121b920ed5a729e69e21d8869d554d736c10f427.zip | |
Merge remote-tracking branch 'origin/peppe/common_test/include_file_problems' into maint
* origin/peppe/common_test/include_file_problems:
Fix failing test case
Add valid include path to epp in erl2html2 and fix crashing code
OTP-12419
Diffstat (limited to 'lib/test_server/test')
| -rw-r--r-- | lib/test_server/test/erl2html2_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/test_server/test/erl2html2_SUITE.erl b/lib/test_server/test/erl2html2_SUITE.erl index 37c2b74d8e..908985c879 100644 --- a/lib/test_server/test/erl2html2_SUITE.erl +++ b/lib/test_server/test/erl2html2_SUITE.erl @@ -161,7 +161,7 @@ convert_module(Mod,Config) -> Src = filename:join(DataDir,Mod++".erl"), Dst = filename:join(PrivDir,Mod++".erl.html"), io:format("<a href=\"~s\">~s</a>\n",[Src,filename:basename(Src)]), - ok = erl2html2:convert(Src, Dst, "<html><body>"), + ok = erl2html2:convert(Src, Dst, [], "<html><body>"), io:format("<a href=\"~s\">~s</a>\n",[Dst,filename:basename(Dst)]), {Src,Dst}. |