From 0f6a66498e789f70ee42e28c0270e74334944fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Thu, 8 Sep 2011 12:11:32 +0200 Subject: erts: Fix failing autoimport test case The autoimport_SUITE:autoimport/1 test case would interpret data type definitions as function calls. Fix this by skipping to the tag before starting to collect function names. --- erts/test/autoimport_SUITE.erl | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'erts/test') diff --git a/erts/test/autoimport_SUITE.erl b/erts/test/autoimport_SUITE.erl index 0e4708e046..ca54f375aa 100644 --- a/erts/test/autoimport_SUITE.erl +++ b/erts/test/autoimport_SUITE.erl @@ -87,10 +87,20 @@ 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), file:close(File), analyze(DocData). +%% Skip lines up to and including the tag. +xskip_to_funcs({ok,Line},File) -> + case re:run(Line,"\\",[{capture,none}]) of + nomatch -> + xskip_to_funcs(file:read_line(File),File); + match -> + ok + end. + xloop({ok,Line},File) -> case re:run(Line,"\\",[{capture,none}]) of nomatch -> -- cgit v1.2.3 From 83e81e574d6a85655936e2a68025f81fbb12a0a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Thu, 8 Sep 2011 12:22:41 +0200 Subject: erts: Add a sanity check to autoimport_SUITE If we fail to parse out any functions from erlang.xml, make sure that we fail. --- erts/test/autoimport_SUITE.erl | 1 + 1 file changed, 1 insertion(+) (limited to 'erts/test') diff --git a/erts/test/autoimport_SUITE.erl b/erts/test/autoimport_SUITE.erl index ca54f375aa..71ed5204b1 100644 --- a/erts/test/autoimport_SUITE.erl +++ b/erts/test/autoimport_SUITE.erl @@ -89,6 +89,7 @@ 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). -- cgit v1.2.3