diff options
author | Björn Gustavsson <[email protected]> | 2011-09-10 07:45:28 +0200 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2011-09-10 07:45:28 +0200 |
commit | 9596e88e69880d2aa769bee5a7d346f2bf365e92 (patch) | |
tree | 22df8e009dc96cd7ff9a2477017fd4a5a91bc7d7 | |
parent | a9ada1d7c71eaeebdfbe8295c1cfdf8e23c81203 (diff) | |
parent | 8802241a20aaa3fb1e101f087812aa8db92a1ea7 (diff) | |
download | otp-9596e88e69880d2aa769bee5a7d346f2bf365e92.tar.gz otp-9596e88e69880d2aa769bee5a7d346f2bf365e92.tar.bz2 otp-9596e88e69880d2aa769bee5a7d346f2bf365e92.zip |
Merge branch 'dev' into major
* dev:
erts: Add a sanity check to autoimport_SUITE
erts: Fix failing autoimport test case
-rw-r--r-- | erts/test/autoimport_SUITE.erl | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/erts/test/autoimport_SUITE.erl b/erts/test/autoimport_SUITE.erl index 0e4708e046..71ed5204b1 100644 --- a/erts/test/autoimport_SUITE.erl +++ b/erts/test/autoimport_SUITE.erl @@ -87,10 +87,21 @@ autoimports(Config) when is_list(Config) -> xml(XMLFile) -> {ok,File} = file:open(XMLFile,[read]), + xskip_to_funcs(file:read_line(File),File), DocData = xloop(file:read_line(File),File), + true = DocData =/= [], file:close(File), analyze(DocData). +%% Skip lines up to and including the <funcs> tag. +xskip_to_funcs({ok,Line},File) -> + case re:run(Line,"\\<funcs\\>",[{capture,none}]) of + nomatch -> + xskip_to_funcs(file:read_line(File),File); + match -> + ok + end. + xloop({ok,Line},File) -> case re:run(Line,"\\<name\\>",[{capture,none}]) of nomatch -> |