Merge branch 'maint'

3 files changed, 56 insertions, 28 deletions

diff --git a/Makefile.in b/Makefile.in
index 761d37ac02..b3327b5c65 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -121,7 +121,7 @@ BINDIR      = $(DESTDIR)$(EXTRA_PREFIX)$(bindir)
 #
 # Erlang base public files
 #
-ERL_BASE_PUB_FILES=erl erlc epmd run_erl to_erl dialyzer typer escript run_test
+ERL_BASE_PUB_FILES=erl erlc epmd run_erl to_erl dialyzer typer escript ct_run run_test
 
 # ERLANG_INST_LIBDIR is the top directory where the Erlang installation
 # will be located when running.
diff --git a/lib/common_test/src/ct_repeat.erl b/lib/common_test/src/ct_repeat.erl
index be3c485b75..e6eb135ae8 100644
--- a/lib/common_test/src/ct_repeat.erl
+++ b/lib/common_test/src/ct_repeat.erl
@@ -116,7 +116,7 @@ spawn_tester(script,Ctrl,Args) ->
 
 spawn_tester(func,Ctrl,Opts) ->
     Tester = fun() ->
-		     case catch ct_run:run_test1(Opts) of
+		     case catch ct_run:run_test2(Opts) of
 			 {'EXIT',Reason} ->
 			     exit(Reason);
 			 Result ->
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index 05b10bca32..45436392d8 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -37,7 +37,7 @@
 
 
 %% Misc internal functions
--export([variables_file_name/1,script_start1/2,run_test1/1]).
+-export([variables_file_name/1,script_start1/2,run_test2/1]).
 
 -include("ct_event.hrl").
 -include("ct_util.hrl").
@@ -1746,25 +1746,31 @@ set_group_leader_same_as_shell() ->
 	    false
     end.
 
-check_and_add([{TestDir0,M,_} | Tests], Added) ->
+check_and_add([{TestDir0,M,_} | Tests], Added, PA) ->
     case locate_test_dir(TestDir0, M) of
 	{ok,TestDir} ->
 	    case lists:member(TestDir, Added) of
 		true ->
-		    check_and_add(Tests, Added);
+		    check_and_add(Tests, Added, PA);
 		false ->
-		    true = code:add_patha(TestDir),
-		    check_and_add(Tests, [TestDir|Added])
+		    case lists:member(rm_trailing_slash(TestDir),
+				      code:get_path()) of
+			false ->
+			    true = code:add_patha(TestDir),
+			    check_and_add(Tests, [TestDir|Added], [TestDir|PA]);
+			true ->
+			    check_and_add(Tests, [TestDir|Added], PA)
+		    end
 	    end;
 	{error,_} ->
 	    {error,{invalid_directory,TestDir0}}
     end;
-check_and_add([], _) ->
-    ok.
+check_and_add([], _, PA) ->
+    {ok,PA}.
 
 do_run_test(Tests, Skip, Opts) ->
-    case check_and_add(Tests, []) of
-	ok ->
+    case check_and_add(Tests, [], []) of
+	{ok,AddedToPath} ->
 	    ct_util:set_testdata({stats,{0,0,{0,0}}}),
 	    ct_util:set_testdata({cover,undefined}),
 	    test_server_ctrl:start_link(local),
@@ -1858,7 +1864,9 @@ do_run_test(Tests, Skip, Opts) ->
 	    end,
 	    lists:foreach(fun(Suite) ->
 				  maybe_cleanup_interpret(Suite, Opts#opts.step)
-			  end, CleanUp);
+			  end, CleanUp),
+	    [code:del_path(Dir) || Dir <- AddedToPath],
+	    ok;
 	Error ->
 	    Error
     end.
@@ -2347,31 +2355,38 @@ event_handler_init_args2opts([]) ->
 %% relative dirs "post run_test erl_args" is not kept!
 rel_to_abs(CtArgs) ->
     {PA,PZ} = get_pa_pz(CtArgs, [], []),
-    io:format(user, "~n", []),
     [begin
-	 code:del_path(filename:basename(D)),
-	 Abs = filename:absname(D),
-	 code:add_pathz(Abs),
-	 if D /= Abs ->
+	 Dir = rm_trailing_slash(D),
+	 Abs = make_abs(Dir),
+	 if Dir /= Abs ->
+		 code:del_path(Dir),
+		 code:del_path(Abs),		 
 		 io:format(user, "Converting ~p to ~p and re-inserting "
 			   "with add_pathz/1~n",
-			   [D, Abs]);
+			   [Dir, Abs]);
 	    true ->
-		 ok
-	 end
+		 code:del_path(Dir)
+	 end,
+	 code:add_pathz(Abs)	 
      end || D <- PZ],
     [begin
-	 code:del_path(filename:basename(D)),
-	 Abs = filename:absname(D),
-	 code:add_patha(Abs),
-	 if D /= Abs ->
+	 Dir = rm_trailing_slash(D),
+	 Abs = make_abs(Dir),
+	 if Dir /= Abs ->
+		 code:del_path(Dir),
+		 code:del_path(Abs),		 
 		 io:format(user, "Converting ~p to ~p and re-inserting "
 			   "with add_patha/1~n",
-			   [D, Abs]);
-	    true ->ok
-	 end
+			   [Dir, Abs]);
+	    true ->
+		 code:del_path(Dir)
+	 end,
+	 code:add_patha(Abs)
      end || D <- PA],
-    io:format(user, "~n", []).
+    io:format(user, "~n", []).	    
+
+rm_trailing_slash(Dir) ->
+    filename:join(filename:split(Dir)).
 
 get_pa_pz([{pa,Dirs} | Args], PA, PZ) ->
     get_pa_pz(Args, PA ++ Dirs, PZ);
@@ -2382,6 +2397,19 @@ get_pa_pz([_ | Args], PA, PZ) ->
 get_pa_pz([], PA, PZ) ->
     {PA,PZ}.
 
+make_abs(RelDir) ->
+    Tokens = filename:split(filename:absname(RelDir)),
+    filename:join(lists:reverse(make_abs1(Tokens, []))).
+
+make_abs1([".."|Dirs], [_Dir|Path]) ->
+    make_abs1(Dirs, Path);
+make_abs1(["."|Dirs], Path) ->
+    make_abs1(Dirs, Path);
+make_abs1([Dir|Dirs], Path) ->
+    make_abs1(Dirs, [Dir|Path]);
+make_abs1([], Path) ->
+    Path.
+
 %% This function translates ct:run_test/1 start options
 %% to ct_run start arguments (on the init arguments format) -
 %% this is useful mainly for testing the ct_run start functions.