@@ -26,6 +26,27 @@ import '.depend_erlang.mf' namespace :erlang do + def handle_test(mode, args) + directories = ERL_DIRECTORIES + ERL_DIRECTORIES.pathmap("%{ebin,test}X") + if args.name + description = "lib/" + args.name + "/test.desc" + if File.file?(description) + run_description_test(description, mode, args.name, directories) + else + run_application_test(args.name, mode, directories) + end + else + ERL_APPLICATIONS.each do |application| + description = application.pathmap("%{ebin,test}d/test.desc") + if File.file?(description) + run_description_test(description, mode, application, directories) + else + run_application_test(application, mode, directories) + end + end + end + end + def collect_boot_files(releases) releases.collect { |elt| if elt =~ /^release/ @@ -98,13 +119,14 @@ namespace :erlang do erlang_source_dependencies + erlang_test_dependencies end - def run_application_test(application, directories) + def run_application_test(application, mode, directories) application_name = application.pathmap("%f").ext("") - run_script("run_test",["application", application_name] + directories) + run_script("run_test",[mode, application_name, "all_tests"] + directories) end - def run_description_test(description, directories) - run_script("run_test",["file", description] + directories) + def run_description_test(description, mode, application, directories) + application_name = application.pathmap("%f").ext("") + run_script("run_test",[mode, application_name, description, ] + directories) end def run_script(script, parameters) @@ -158,6 +180,7 @@ namespace :erlang do end CLEAN.include("lib/*/test/*.beam") + CLEAN.include("lib/*/cover") def beam_dependencies_with_emake(beam, file) dependencies = check_dependencies(file).uniq @@ -201,15 +224,14 @@ namespace :erlang do file.write("{\"#{elt}/*\",#{option_string}}.\n") end end - sh "#{ERL_TOP}/bin/erl -noinput -s make all -s erlang halt " end CLEAN.include "Emakefile" -# rule ".beam" => ["Emakefile"] do |t| -# output = t.name.pathmap("%d") -# sh "#{ERL_TOP}/bin/erl -noinput -s make all -s erlang halt " -# end - + desc "Compile Erlang sources" + task :modules => ERL_DIRECTORIES + ERL_BEAM + ERL_BEAM_TESTS do + sh "#{ERL_TOP}/bin/erl -noinput -s make all -s erlang halt " + end + else def erlang_test_dependencies FileList['lib/*/test/*.erl'].collect { |file| @@ -229,6 +251,10 @@ namespace :erlang do output = t.name.pathmap("%d") sh "#{ERL_TOP}/bin/erlc -Ilib #{ERLC_FLAGS} -o #{output} #{t.source}" end + + desc "Compile Erlang sources" + task :modules => ERL_DIRECTORIES + ERL_BEAM + ERL_BEAM_TESTS + end rule '.app' => ["%{ebin,src}X.app.src", "%{ebin,src}d/../vsn.config"] do |t| @@ -308,32 +334,20 @@ namespace :erlang do } end - desc "Compile Erlang sources" - task :modules => ERL_DIRECTORIES + ERL_BEAM + ERL_BEAM_TESTS desc "Run erlang unit test for all or a specific application."\ "(No name given mean all applications)" task :tests, :name, :needs => [:applications] + ERL_BEAM_TESTS do |t, args| - directories = ERL_DIRECTORIES + ERL_DIRECTORIES.pathmap("%{ebin,test}X") - if args.name - description = "lib/" + args.name + "/test.desc" - if File.file?(description) - run_description_test(description, directories) - else - run_application_test(args.name, directories) - end - else - ERL_APPLICATIONS.each do |application| - description = application.pathmap("%{ebin,test}d/test.desc") - if File.file?(description) - run_description_test(description, directories) - else - run_application_test(application, directories) - end - end - end - + handle_test("test", args) + end + + + desc "Run cover on unit test for all or a specific application."\ + "(No name given mean all applications)" + task :cover, :name, :needs => [:applications] + ERL_BEAM_TESTS do + |t, args| + handle_test("cover", args) end desc "Build application resource file" rakelib/erlang.rake @@ -1,22 +1,87 @@ %% -*- erlang -*- -%% Copyright (c) 2008 Nicolas Charpentier -main([Type,Application|Paths]) -> +%% Copyright (c) 2008-2009 Nicolas Charpentier +main([Mode, Application, Type |Paths]) -> + run(Mode, Application, Type, Paths); +main(_) -> + usage(). + +run(Mode, Application, Type, Paths) -> + F = execution_fun(Mode, Application, Type), try [code:add_path(Path) || Path <- Paths], - ok = run_test(Type,Application) + ok = F() catch E:R -> exit({E,R,erlang:get_stacktrace()}) - end; -main(_) -> - usage(). - -run_test("application", Application) -> + end. + +execution_fun("test", Application, Type) -> + fun() -> run_test(Application, Type) end; +execution_fun("cover", Application, Type) -> + Fun = fun() -> ok = run_test(Application, Type) end, + fun () -> + Sources = filename:join(code:lib_dir(Application),"src"), + Out = filename:join(code:lib_dir(Application),"cover"), + Options = [{directories,[Sources]},{output_directory,Out}], + ok = application:load(list_to_atom(Application)), + cover(Fun, Options) end. + +run_test(Application, "all_tests") -> eunit:test({application, list_to_atom(Application)},[]); -run_test("file", File) -> +run_test(_, File) -> eunit:test({file, File},[]). usage() -> - io:format("usage: run_test \"application\"|\"file\" <application_name|file_name> <application_path>\n"), + io:format("usage: run_test \"test\"|\"cover\" <application_name> <\"all_tests\"|test_description_file> <application_path>\n"), halt(1). +cover(Fun, Options) -> + Directories = proplists: get_value(directories, Options, []), + + [cover:compile_directory(D) || D <- Directories], + try Fun() of + ok -> ok + catch E:R -> + exit({E,R,erlang:get_stacktrace()}) + after + report(Options) + end. + +report(Options) -> + F = fun(M) -> + App = case application:get_application(M) of + {ok, X} -> X; + _ -> undefined + end, + Analyse = cover:analyse(M,calls,line), + {App, M, Analyse} + end, + Results = [F(M) || M <- cover:modules()], + Coverage = cover_to_xml(Results), + Export = xmerl:export_simple([{cover, Coverage}], xmerl_xml), + + Output_directory = proplists: get_value(output_directory, Options, "."), + Directory_name = filename:absname(Output_directory), + ok = filelib:ensure_dir(Directory_name), + file:make_dir(Directory_name), + true = filelib:is_dir(Directory_name), + + Summary_file = filename:join(Output_directory, "cover_tool.xml"), + file:write_file(Summary_file, Export), + + HTML_file = fun(M) -> + filename:join(Directory_name, atom_to_list(M) ++".COVER.html") + end, + [cover:analyse_to_file(M, HTML_file(M), [html]) || M <-cover:modules()], + ok. + +cover_to_xml(Results) -> + [cover_to_xml(App, M, Lines) || {App,M,{ok,Lines}} <- Results]. + +cover_to_xml(App, Module, Lines) -> + F = fun({_,0}) -> false; + (_) -> true end, + + Called = length(lists:filter(F, Lines)), + Uncalled = length(Lines) - Called, + {module,[{application, App},{name,Module}], [{lines,[{called, Called}, {uncalled, Uncalled}],[]}]}. rakelib/escripts/run_test 00477ec5a3dc67d0c55422f26703e508aaab9ea5 charpi charpi@3ab005ec-33ed-11dd-9e78-a92e4af85449 http://github.com/charpi/erl_selenium/commit/9984d0281c68fcc4d4d0fdaa38a5efecc7fe7990 9984d0281c68fcc4d4d0fdaa38a5efecc7fe7990 2009-05-30T05:10:29-07:00 2009-05-30T05:10:29-07:00 Update rakelib 9cb53aba1eae27da3c67a8965d0f694e9c55718c charpi charpi@3ab005ec-33ed-11dd-9e78-a92e4af85449