aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/test
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-05-03 14:28:17 +0200
committerFredrik Gustafsson <[email protected]>2013-05-03 14:28:17 +0200
commitb306fa57d3f78b86fea04438483e2d34fcb91d0e (patch)
treea909621a8903413a41edcc95736cb5be59cd03ec /lib/stdlib/test
parent31f93961ef487122000b9f16fc660dfd1479633b (diff)
parentd08b9775ad07a89d070aa653a1e5549ce705d524 (diff)
downloadotp-b306fa57d3f78b86fea04438483e2d34fcb91d0e.tar.gz
otp-b306fa57d3f78b86fea04438483e2d34fcb91d0e.tar.bz2
otp-b306fa57d3f78b86fea04438483e2d34fcb91d0e.zip
Merge branch 'maint'
Conflicts: bootstrap/lib/stdlib/ebin/epp.beam
Diffstat (limited to 'lib/stdlib/test')
-rw-r--r--lib/stdlib/test/epp_SUITE.erl4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl
index b2f1aa955a..0cbdf76270 100644
--- a/lib/stdlib/test/epp_SUITE.erl
+++ b/lib/stdlib/test/epp_SUITE.erl
@@ -104,6 +104,8 @@ include_local(suite) ->
include_local(Config) when is_list(Config) ->
?line DataDir = ?config(data_dir, Config),
?line File = filename:join(DataDir, "include_local.erl"),
+ FooHrl = filename:join([DataDir,"include","foo.hrl"]),
+ BarHrl = filename:join([DataDir,"include","bar.hrl"]),
%% include_local.erl includes include/foo.hrl which
%% includes bar.hrl (also in include/) without requiring
%% any additional include path, and overriding any file
@@ -111,6 +113,8 @@ include_local(Config) when is_list(Config) ->
?line {ok, List} = epp:parse_file(File, [DataDir], []),
?line {value, {attribute,_,a,{true,true}}} =
lists:keysearch(a,3,List),
+ [{File,1},{FooHrl,1},{BarHrl,1},{FooHrl,5},{File,5}] =
+ [ FileLine || {attribute,_,file,FileLine} <- List ],
ok.
%%% Here is a little reimplementation of epp:parse_file, which times out