Merge branch 'dev' into major

14 files changed, 16 insertions, 54 deletions

diff --git a/lib/eunit/src/eunit.erl b/lib/eunit/src/eunit.erl
index 15fc3bdf32..95857e83c8 100644
--- a/lib/eunit/src/eunit.erl
+++ b/lib/eunit/src/eunit.erl
@@ -13,13 +13,10 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: eunit.erl 339 2009-04-05 14:10:47Z rcarlsson $
-%%
 %% @copyright 2004-2009 Micka�l R�mond, Richard Carlsson
 %% @author Micka�l R�mond <[email protected]>
 %%   [http://www.process-one.net/]
-%% @author Richard Carlsson <[email protected]>
-%%   [http://user.it.uu.se/~richardc/]
+%% @author Richard Carlsson <[email protected]>
 %% @version {@version}, {@date} {@time}
 %% @doc This module is the main EUnit user interface.
 
diff --git a/lib/eunit/src/eunit_autoexport.erl b/lib/eunit/src/eunit_autoexport.erl
index 7b153c1194..099bcb222e 100644
--- a/lib/eunit/src/eunit_autoexport.erl
+++ b/lib/eunit/src/eunit_autoexport.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: eunit_autoexport.erl 329 2009-03-01 11:23:32Z rcarlsson $ 
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2006 Richard Carlsson
 %% @private
 %% @see eunit
diff --git a/lib/eunit/src/eunit_data.erl b/lib/eunit/src/eunit_data.erl
index 288dd74ddf..392d378a0e 100644
--- a/lib/eunit/src/eunit_data.erl
+++ b/lib/eunit/src/eunit_data.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$ 
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2006 Richard Carlsson
 %% @private
 %% @see eunit
diff --git a/lib/eunit/src/eunit_internal.hrl b/lib/eunit/src/eunit_internal.hrl
index 8d0ac30bd7..92694ec39b 100644
--- a/lib/eunit/src/eunit_internal.hrl
+++ b/lib/eunit/src/eunit_internal.hrl
@@ -1,11 +1,7 @@
 %% -------------------------------------------------------------------
 %% File: eunit_internal.hrl
 %%
-%% $Id: eunit_internal.hrl 329 2009-03-01 11:23:32Z rcarlsson $ 
-%%
-%% @author Richard Carlsson <[email protected]>
-%% @copyright 2006 Richard Carlsson
-%% @doc 
+%% Copyright (C) 2006 Richard Carlsson <[email protected]>
 
 -define(SERVER, eunit_server).
 -define(DEFAULT_TEST_SUFFIX, "_test").
diff --git a/lib/eunit/src/eunit_lib.erl b/lib/eunit/src/eunit_lib.erl
index 45d2387e7b..1c41e229c5 100644
--- a/lib/eunit/src/eunit_lib.erl
+++ b/lib/eunit/src/eunit_lib.erl
@@ -13,13 +13,10 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: eunit_lib.erl 339 2009-04-05 14:10:47Z rcarlsson $
-%%
 %% @copyright 2004-2007 Micka�l R�mond, Richard Carlsson
 %% @author Micka�l R�mond <[email protected]>
 %%   [http://www.process-one.net/]
-%% @author Richard Carlsson <[email protected]>
-%%   [http://user.it.uu.se/~richardc/]
+%% @author Richard Carlsson <[email protected]>
 %% @private
 %% @see eunit
 %% @doc Utility functions for eunit
diff --git a/lib/eunit/src/eunit_listener.erl b/lib/eunit/src/eunit_listener.erl
index 20faecbf01..ecaac424a2 100644
--- a/lib/eunit/src/eunit_listener.erl
+++ b/lib/eunit/src/eunit_listener.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2009 Richard Carlsson
 %% @private
 %% @see eunit
diff --git a/lib/eunit/src/eunit_proc.erl b/lib/eunit/src/eunit_proc.erl
index e2d51d8bd5..ec7d93fd48 100644
--- a/lib/eunit/src/eunit_proc.erl
+++ b/lib/eunit/src/eunit_proc.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$ 
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2006 Richard Carlsson
 %% @private
 %% @see eunit
diff --git a/lib/eunit/src/eunit_serial.erl b/lib/eunit/src/eunit_serial.erl
index d9ccae86f9..80e79116e3 100644
--- a/lib/eunit/src/eunit_serial.erl
+++ b/lib/eunit/src/eunit_serial.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id$ 
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2006 Richard Carlsson
 %% @private
 %% @see eunit
diff --git a/lib/eunit/src/eunit_server.erl b/lib/eunit/src/eunit_server.erl
index 2cdfef2668..2002930abb 100644
--- a/lib/eunit/src/eunit_server.erl
+++ b/lib/eunit/src/eunit_server.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: eunit_server.erl 267 2008-10-19 18:48:03Z rcarlsson $
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2006 Richard Carlsson
 %% @private
 %% @see eunit
diff --git a/lib/eunit/src/eunit_striptests.erl b/lib/eunit/src/eunit_striptests.erl
index 606e44b286..c6ade389ba 100644
--- a/lib/eunit/src/eunit_striptests.erl
+++ b/lib/eunit/src/eunit_striptests.erl
@@ -13,10 +13,8 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: eunit_striptests.erl 329 2009-03-01 11:23:32Z rcarlsson $ 
-%%
-%% @author Richard Carlsson <[email protected]>
-%% @author Eric Merritt <[email protected]>
+%% @author Richard Carlsson <[email protected]>
+%% @author Eric Merritt <[email protected]>
 %% @copyright 2006 Richard Carlsson, Eric Merritt
 %% @private
 %% @see eunit
diff --git a/lib/eunit/src/eunit_surefire.erl b/lib/eunit/src/eunit_surefire.erl
index 6e0a447105..2a6cbca14d 100644
--- a/lib/eunit/src/eunit_surefire.erl
+++ b/lib/eunit/src/eunit_surefire.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: $
-%%
-%% @author Micka�l R�mond <[email protected]>
+%% @author Micka�l R�mond <[email protected]>
 %% @copyright 2009 Micka�l R�mond, Paul Guyot
 %% @see eunit
 %% @doc Surefire reports for EUnit (Format used by Maven and Atlassian
@@ -58,7 +56,7 @@
 	{
 	  name :: chars(),
 	  description :: chars(),
-	  result :: ok | {failed, tuple()} | {aborted, tuple()} | {skipped, tuple()},
+	  result :: ok | {failed, tuple()} | {aborted, tuple()} | {skipped, term()},
 	  time :: integer(),
 	  output :: binary()
 	 }).
@@ -311,7 +309,6 @@ write_testcase(
             output = Output},
         FileDescriptor) ->
     DescriptionAttr = case Description of
-			  <<>> -> [];
 			  [] -> [];
 			  _ -> [<<" description=\"">>, escape_attr(Description), <<"\"">>]
 		      end,
@@ -320,7 +317,6 @@ write_testcase(
         <<"\" name=\"">>, escape_attr(Name), <<"\"">>,
         DescriptionAttr],
     ContentAndEndTag = case {Result, Output} of
-        {ok, []} -> [<<"/>">>, ?NEWLINE];
         {ok, <<>>} -> [<<"/>">>, ?NEWLINE];
         _ -> [<<">">>, ?NEWLINE, format_testcase_result(Result), format_testcase_output(Output), ?INDENT, <<"</testcase>">>, ?NEWLINE]
     end,
@@ -369,7 +365,6 @@ format_testcase_result({skipped, Term}) ->
 %% Empty output is simply the empty string.
 %% Other output is inside a <system-out> xml tag.
 %% ----------------------------------------------------------------------------
-format_testcase_output([]) -> [];
 format_testcase_output(Output) ->
     [?INDENT, ?INDENT, <<"<system-out>">>, escape_text(Output), ?NEWLINE, ?INDENT, ?INDENT, <<"</system-out>">>, ?NEWLINE].
 
@@ -387,8 +382,6 @@ format_time_s([Digit1, Digit2, Digit3 | Tail]) -> [lists:reverse(Tail), $., Digi
 %% Escape a suite's name to generate the filename.
 %% Remark: we might overwrite another testsuite's file.
 %% ----------------------------------------------------------------------------
-escape_suitename([Head | _T] = List) when is_list(Head) ->
-    escape_suitename(lists:flatten(List));
 escape_suitename(Binary) when is_binary(Binary) ->
     escape_suitename(binary_to_list(Binary));
 escape_suitename("module '" ++ String) ->
@@ -396,7 +389,6 @@ escape_suitename("module '" ++ String) ->
 escape_suitename(String) ->
     escape_suitename(String, []).
 
-escape_suitename(Binary, Acc) when is_binary(Binary) -> escape_suitename(binary_to_list(Binary), Acc);
 escape_suitename([], Acc) -> lists:reverse(Acc);
 escape_suitename([$  | Tail], Acc) -> escape_suitename(Tail, [$_ | Acc]);
 escape_suitename([$' | Tail], Acc) -> escape_suitename(Tail, Acc);
diff --git a/lib/eunit/src/eunit_test.erl b/lib/eunit/src/eunit_test.erl
index 9ac1d1e7d9..bca49ae626 100644
--- a/lib/eunit/src/eunit_test.erl
+++ b/lib/eunit/src/eunit_test.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: eunit_test.erl 336 2009-03-06 14:43:21Z rcarlsson $ 
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2006 Richard Carlsson
 %% @private
 %% @see eunit
diff --git a/lib/eunit/src/eunit_tests.erl b/lib/eunit/src/eunit_tests.erl
index a63d102d98..47ea0aaf46 100644
--- a/lib/eunit/src/eunit_tests.erl
+++ b/lib/eunit/src/eunit_tests.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: eunit_tests.erl 238 2007-11-15 10:23:54Z mremond $ 
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2007 Richard Carlsson
 %% @private
 %% @see eunit
diff --git a/lib/eunit/src/eunit_tty.erl b/lib/eunit/src/eunit_tty.erl
index 5fe0140559..e3e7b710b2 100644
--- a/lib/eunit/src/eunit_tty.erl
+++ b/lib/eunit/src/eunit_tty.erl
@@ -13,9 +13,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% $Id: eunit_tty.erl 330 2009-03-01 16:28:02Z rcarlsson $ 
-%%
-%% @author Richard Carlsson <[email protected]>
+%% @author Richard Carlsson <[email protected]>
 %% @copyright 2006-2009 Richard Carlsson
 %% @private
 %% @see eunit