diff options
| author | Henrik Nord <[email protected]> | 2011-10-20 14:40:37 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-10-20 14:40:46 +0200 |
| commit | 1fd0ef56ce4432ea6e6ddbcd0af81c71b7921b38 (patch) | |
| tree | 1aa7db2d67e2e6731ab5903d8bee38a126e60c27 /lib/stdlib/test/epp_SUITE.erl | |
| parent | 896c1c7d262790d71019a583d880ee384e357167 (diff) | |
| parent | 36a4d64ae7f39448ceb7c87bc4c8c0a9a9b72e1c (diff) | |
| download | otp-1fd0ef56ce4432ea6e6ddbcd0af81c71b7921b38.tar.gz otp-1fd0ef56ce4432ea6e6ddbcd0af81c71b7921b38.tar.bz2 otp-1fd0ef56ce4432ea6e6ddbcd0af81c71b7921b38.zip | |
Merge branch 'rc/epp-include-path-fix'
* rc/epp-include-path-fix:
Make epp search directory of current file first when including another file
OTP-9645
Diffstat (limited to 'lib/stdlib/test/epp_SUITE.erl')
| -rw-r--r-- | lib/stdlib/test/epp_SUITE.erl | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl index 57f3f4eddb..e58022f4da 100644 --- a/lib/stdlib/test/epp_SUITE.erl +++ b/lib/stdlib/test/epp_SUITE.erl @@ -20,7 +20,7 @@ -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]). --export([rec_1/1, predef_mac/1, +-export([rec_1/1, include_local/1, predef_mac/1, upcase_mac_1/1, upcase_mac_2/1, variable_1/1, otp_4870/1, otp_4871/1, otp_5362/1, pmod/1, not_circular/1, skip_header/1, otp_6277/1, otp_7702/1, @@ -63,7 +63,7 @@ end_per_testcase(_, Config) -> suite() -> [{ct_hooks,[ts_install_cth]}]. all() -> - [rec_1, {group, upcase_mac}, predef_mac, + [rec_1, {group, upcase_mac}, include_local, predef_mac, {group, variable}, otp_4870, otp_4871, otp_5362, pmod, not_circular, skip_header, otp_6277, otp_7702, otp_8130, overload_mac, otp_8388, otp_8470, otp_8503, otp_8562, @@ -97,6 +97,22 @@ rec_1(Config) when is_list(Config) -> ?line check_errors(List), ok. +include_local(doc) -> + []; +include_local(suite) -> + []; +include_local(Config) when is_list(Config) -> + ?line DataDir = ?config(data_dir, Config), + ?line File = filename:join(DataDir, "include_local.erl"), + %% include_local.erl includes include/foo.hrl which + %% includes bar.hrl (also in include/) without requiring + %% any additional include path, and overriding any file + %% of the same name that the path points to + ?line {ok, List} = epp:parse_file(File, [DataDir], []), + ?line {value, {attribute,_,a,{true,true}}} = + lists:keysearch(a,3,List), + ok. + %%% Here is a little reimplementation of epp:parse_file, which times out %%% after 4 seconds if the epp server doesn't respond. If we use the %%% regular epp:parse_file, the test case will time out, and then epp |