Merge branch 'maint'

* maint:
  [sasl] Fix tests that compare execution time
  Prepare release
  PER: Ensure that the complete encoding is at least one byte
  PER/UPER: Correct decoding of ENUMERATEDs with a single value
  [jinterface] Kill process between tests to avoid consequential error
  [observer] Extend timer to allow trace msgs to arrive over tcp/ip
  [observer] Kill slave node between tests in etop_SUITE
  [observer] Accept current function for a process to be 'undefined' on hipe
  [observer] Improve measurement of CPU utilization in etop
  [observer] Fix non tail-recusive loop when measuring scheduler utilization
  [jinterface] Make tests handle space in path on windows
  [common_test] Extend timers for slave nodes in ct_cover_SUITE
  [test_server] Clean up unused code in test_server_SUITE
  [reltool] Increase timetrap timeout for reltool_server_SUTIE to 10 minutes
  [test_server] Fix encoding of HTML file references to work on windows
  [test_server] Use simpler tc name in unicode test to make it work on windows

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/jinterface/test/jinterface_SUITE.erl b/lib/jinterface/test/jinterface_SUITE.erl
index 82bc878112..b438da12d0 100644
--- a/lib/jinterface/test/jinterface_SUITE.erl
+++ b/lib/jinterface/test/jinterface_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -184,6 +184,10 @@ init_per_testcase(_Case,Config) ->
     [{watch_dog,Dog}|Config].
 
 end_per_testcase(_Case,Config) ->
+    case whereis(erl_link_server) of
+	undefined -> ok;
+	Pid -> exit(Pid,kill)
+    end,
     ?t:timetrap_cancel(?config(watch_dog,Config)),
     ok.