3 files changed, 73 insertions, 10 deletions

diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index b53ba32e6c..f4ce5369f7 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -32,6 +32,54 @@
     <file>notes.xml</file>
     </header>
 
+<section><title>Common_Test 1.8.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Ticket OTP-11971 introduced a runtime dependency towards
+	    test_server-3.7.1, since the interface between
+	    test_server and common_test was changed. Erroneously, the
+	    common_test.app file was not updated according to this.
+	    This has now been corrected.</p>
+          <p>
+	    Own Id: OTP-12037</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Warning: this is experimental and may disappear or change
+	    without previous warning.</p>
+          <p>
+	    Experimental support for running Quickcheck and PropEr
+	    tests from common_test suites is added to common_test.
+	    See the reference manual for the new module
+	    <c>ct_property_testing</c>.</p>
+          <p>
+	    Experimental property tests are added under
+	    <c>lib/{inet,ssh}/test/property_test</c>. They can be run
+	    directly or from the commont_test suites
+	    <c>inet/ftp_property_test_SUITE.erl</c> and
+	    <c>ssh/test/ssh_property_test_SUITE.erl</c>.</p>
+          <p>
+	    See the code in the <c>test</c> directories and the man
+	    page for details.</p>
+          <p>
+	    (Thanks to Tuncer Ayaz for a patch adding Triq)</p>
+          <p>
+	    Own Id: OTP-12119</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.8.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/common_test/src/ct_cover.erl b/lib/common_test/src/ct_cover.erl
index cf2860ae25..c7f446dee9 100644
--- a/lib/common_test/src/ct_cover.erl
+++ b/lib/common_test/src/ct_cover.erl
@@ -128,20 +128,20 @@ get_spec(File) ->
     catch get_spec_test(File).
 
 get_spec_test(File) ->
-    FullName = filename:absname(File),
-    case filelib:is_file(FullName) of
+    Dir = filename:dirname(File), % always abs path in here, set in ct_run
+    case filelib:is_file(File) of
 	true ->
-	    case file:consult(FullName) of
+	    case file:consult(File) of
 		{ok,Terms} ->
 		    Import = 
 			case lists:keysearch(import, 1, Terms) of
 			    {value,{_,Imps=[S|_]}} when is_list(S) ->
 				ImpsFN = lists:map(fun(F) -> 
-							  filename:absname(F) 
+							  filename:absname(F,Dir)
 						  end, Imps),
 				test_files(ImpsFN, ImpsFN);
 			    {value,{_,Imp=[IC|_]}} when is_integer(IC) ->
-				ImpFN = filename:absname(Imp),
+				ImpFN = filename:absname(Imp,Dir),
 				test_files([ImpFN], [ImpFN]);
 			    _ -> 
 				[]
@@ -149,9 +149,9 @@ get_spec_test(File) ->
 		    Export = 
 			case lists:keysearch(export, 1, Terms) of
 			    {value,{_,Exp=[EC|_]}} when is_integer(EC) -> 
-				filename:absname(Exp);
+				filename:absname(Exp,Dir);
 			    {value,{_,[Exp]}} ->
-				filename:absname(Exp);
+				filename:absname(Exp,Dir);
 			    _ -> 
 				undefined
 			end,
@@ -179,7 +179,7 @@ get_spec_test(File) ->
 				    E;
 				[CoverSpec] ->
 				    CoverSpec1 = remove_excludes_and_dups(CoverSpec),
-				    {FullName,Nodes,Import,Export,CoverSpec1};
+				    {File,Nodes,Import,Export,CoverSpec1};
 				_ ->
 				    {error,multiple_apps_in_cover_spec}
 			    end;
@@ -190,7 +190,7 @@ get_spec_test(File) ->
 		    {error,{invalid_cover_spec,Error}}
 	    end;
 	false ->
-	    {error,{cant_read_cover_spec_file,FullName}}
+	    {error,{cant_read_cover_spec_file,File}}
     end.
 
 collect_apps([{level,Level}|Ts], Apps) ->
diff --git a/lib/common_test/test/ct_cover_SUITE.erl b/lib/common_test/test/ct_cover_SUITE.erl
index 47080b5577..87ba4ae1b9 100644
--- a/lib/common_test/test/ct_cover_SUITE.erl
+++ b/lib/common_test/test/ct_cover_SUITE.erl
@@ -76,7 +76,8 @@ all() ->
      cover_node_option,
      ct_cover_add_remove_nodes,
      otp_9956,
-     cross
+     cross,
+     export_import
     ].
 
 %%--------------------------------------------------------------------
@@ -199,6 +200,20 @@ cross(Config) ->
 
     ok.
 
+export_import(Config) ->
+    DataDir = ?config(data_dir,Config),
+    false = check_cover(Config),
+    CoverSpec1 =
+	default_cover_file_content() ++ [{export,"export_import.coverdata"}],
+    CoverFile1 = create_cover_file(export_import1,CoverSpec1,Config),
+    {ok,Events1} = run_test(export_import1,default,[{cover,CoverFile1}],Config),
+    check_calls(Events1,1),
+    CoverSpec2 =
+	default_cover_file_content() ++ [{import,"export_import.coverdata"}],
+    CoverFile2 = create_cover_file(export_import2,CoverSpec2,Config),
+    {ok,Events2} = run_test(export_import2,default,[{cover,CoverFile2}],Config),
+    check_calls(Events2,2),
+    ok.
 
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS