Merge branch 'maint-r14' of super:otp into nick/ssh/memory_leak/OTP-9232

6 files changed, 62 insertions, 10 deletions

diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index fef1222fcb..d6caebc4fe 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -32,6 +32,34 @@
     <file>notes.xml</file>
     </header>
 
+<section><title>Common_Test 1.5.3.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Removes backwards incompatability introduced between
+	    test_server and common_test in R14B02.</p>
+          <p>
+	    Own Id: OTP-9200 Aux Id: seq11818 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Known Bugs and Problems</title>
+      <list>
+        <item>
+          <p>
+	    Multiple skip events in test spec suite.</p>
+          <p>
+	    Own Id: OTP-9054</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.5.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 38a2aa53ac..3d4f674160 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -24,7 +24,7 @@
 
 -module(ct_framework).
 
--export([init_tc/3, end_tc/4, get_suite/2, report/2, warn/1]).
+-export([init_tc/3, end_tc/3, end_tc/4, get_suite/2, report/2, warn/1]).
 -export([error_notification/4]).
 
 -export([overview_html_header/1]).
@@ -434,6 +434,9 @@ try_set_default(Name,Key,Info,Where) ->
 %%%
 %%% @doc Test server framework callback, called by the test_server
 %%% when a test case is finished.
+end_tc(Mod, Fun, Args) ->
+    %% Have to keep end_tc/3 for backwards compatabilty issues
+    end_tc(Mod, Fun, Args, '$end_tc_dummy').
 end_tc(?MODULE,error_in_suite,_, _) ->		% bad start!
     ok;
 end_tc(Mod,Func,{TCPid,Result,[Args]}, Return) when is_pid(TCPid) ->
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index 8a4853e070..9ba8e43d8d 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1,3 +1,3 @@
-COMMON_TEST_VSN = 1.5.3
+COMMON_TEST_VSN = 1.5.3.1
 
 
diff --git a/lib/test_server/doc/src/notes.xml b/lib/test_server/doc/src/notes.xml
index 9c62b0fcf6..26b6c5578c 100644
--- a/lib/test_server/doc/src/notes.xml
+++ b/lib/test_server/doc/src/notes.xml
@@ -32,6 +32,22 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Test_Server 3.4.3.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Removes backwards incompatability introduced between
+	    test_server and common_test in R14B02.</p>
+          <p>
+	    Own Id: OTP-9200 Aux Id: seq11818 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Test_Server 3.4.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 7f0011bd68..8fe7d72270 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -1193,11 +1193,10 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 
 do_end_tc_call(M,F,Res,Return) ->
     Ref = make_ref(),
-    case test_server_sup:framework_call(
-	   end_tc, [?pl2a(M),F,Res], Ref) of
-	{fail,FWReason} ->
-	    {failed,FWReason};
-	Ref ->
+    case os:getenv("TEST_SERVER_FRAMEWORK") of
+	FW when FW == "ct_framework";
+		FW == "undefined";
+		FW == false ->
 	    case test_server_sup:framework_call(
 		   end_tc, [?pl2a(M),F,Res, Return], ok) of
 		{fail,FWReason} ->
@@ -1212,8 +1211,14 @@ do_end_tc_call(M,F,Res,Return) ->
 		NewReturn ->
 		    NewReturn
 	    end;
-	_ ->
-	    Return
+	Other ->
+	    case test_server_sup:framework_call(
+		   end_tc, [Other,F,Res], Ref) of
+		{fail,FWReason} ->
+		    {failed,FWReason};
+		_Else ->
+		    Return
+	    end
     end.
 
 %% the return value is a list and we have to check if it contains
diff --git a/lib/test_server/vsn.mk b/lib/test_server/vsn.mk
index b7c0987845..a394a3b980 100644
--- a/lib/test_server/vsn.mk
+++ b/lib/test_server/vsn.mk
@@ -1,2 +1,2 @@
-TEST_SERVER_VSN = 3.4.3
+TEST_SERVER_VSN = 3.4.3.1