Merge branch 'master' into sverk/master/halt-INT_MIN

14 files changed, 96 insertions, 151 deletions

diff --git a/lib/tools/test/Makefile b/lib/tools/test/Makefile
index 49b86628b7..8768413dc1 100644
--- a/lib/tools/test/Makefile
+++ b/lib/tools/test/Makefile
@@ -53,8 +53,7 @@ RELSYSDIR = $(RELEASE_PATH)/tools_test
 # FLAGS
 # ----------------------------------------------------
 ERL_MAKE_FLAGS += 
-ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/test_server/include \
-	-I$(ERL_TOP)/lib/percept/include
+ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/percept/include
 
 EBIN = .
 
diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index 25c9317608..b9a9cd5be4 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -19,43 +19,17 @@
 %%
 -module(cover_SUITE).
 
--export([all/0, init_per_testcase/2, end_per_testcase/2,
-	 suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2]).
-
--export([coverage/1, coverage_analysis/1,
-	 start/1, compile/1, analyse/1, misc/1, stop/1,
-	 distribution/1, reconnect/1, die_and_reconnect/1,
-	 dont_reconnect_after_stop/1, stop_node_after_disconnect/1,
-	 export_import/1,
-	 otp_5031/1, eif/1, otp_5305/1, otp_5418/1, otp_6115/1, otp_7095/1,
-         otp_8188/1, otp_8270/1, otp_8273/1, otp_8340/1,
-         otp_10979_hanging_node/1, compile_beam_opts/1, eep37/1,
-         analyse_no_beam/1, line_0/1]).
-
--export([do_coverage/1]).
-
--export([distribution_performance/1]).
-
--include_lib("test_server/include/test_server.hrl").
-
-%%----------------------------------------------------------------------
-%% The following directory structure is assumed:
-%%  cwd __________________________________________
-%%  |  \   \   \   \   \     \                    \
-%%  a   b   cc   d   f  d1   compile_beam_____  otp_6115
-%%                      |      \    \  \  \   \    \  \
-%%                      e      crypt v  w  x   d   f1  f2
-%%                                             |
-%%                                             y
-%%----------------------------------------------------------------------
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     NoStartStop = [eif,otp_5305,otp_5418,otp_7095,otp_8273,
                    otp_8340,otp_8188,compile_beam_opts,eep37,
-		   analyse_no_beam, line_0],
+		   analyse_no_beam, line_0, compile_beam_no_file,
+                   otp_13277],
     StartStop = [start, compile, analyse, misc, stop,
 		 distribution, reconnect, die_and_reconnect,
 		 dont_reconnect_after_stop, stop_node_after_disconnect,
@@ -778,8 +752,8 @@ distribution_performance(Config) ->
     %% 		   [{ok,_} = cover:compile_beam(Mod) || Mod <- Mods]
     %% 	   end,
     CFun = fun() -> cover:compile_beam(Mods) end,
-    {CT,CA} = timer:tc(CFun),
-%    erlang:display(CA),
+    {CT,_CA} = timer:tc(CFun),
+%    erlang:display(_CA),
     erlang:display({compile,CT}),
 
     {SNT,_} = timer:tc(fun() -> {ok,[N1]} = cover:start(nodes()) end),
@@ -799,7 +773,7 @@ distribution_performance(Config) ->
 
 %    Fun = fun() -> cover:reset() end,
 
-    {AT,A} = timer:tc(Fun),
+    {AT,_A} = timer:tc(Fun),
     erlang:display({analyse,AT}),
 %    erlang:display(lists:sort([X || X={_MFA,N} <- lists:append([L || {ok,L}<-A]), N=/=0])),
 
@@ -1279,7 +1253,7 @@ otp_8340(doc) ->
     ["OTP-8340. Bug."];
 otp_8340(suite) -> [];
 otp_8340(Config) when is_list(Config) ->
-    ?line [{{t,1},1},{{t,2},1},{{t,4},1}] = 
+    ?line [{{t,1},1},{{t,4},1}] =
         analyse_expr(<<"<< \n"
                        " <<3:2, \n"
                        "   SeqId:62>> \n"
@@ -1573,8 +1547,10 @@ comprehension_8188(Cf) ->
                        "    true]. \n" % 2
                        "  two() -> 2">>, Cf), % 1
 
+    %% The template cannot have a counter since it is not allowed to
+    %% be a block.
     ?line [{{t,1},1},
-           {{t,2},2},
+           %% {{t,2},2},
            {{t,3},1},
            {{t,4},1},
            {{t,5},0},
@@ -1584,7 +1560,7 @@ comprehension_8188(Cf) ->
            {{t,13},2},
            {{t,14},2}] = 
         analyse_expr(<<"<< \n" % 1
-                       " << (X*2) >> || \n" % 2
+                       " << (X*2) >> || \n" % 2 (now: 0)
                        "    <<X>> <= << (case two() of\n"
                        "                     2 -> 1;\n" % 1
                        "                     _ -> 2\n" % 0
@@ -1599,7 +1575,7 @@ comprehension_8188(Cf) ->
                        "two() -> 2">>, Cf),
 
     ?line [{{t,1},1},
-           {{t,2},4},
+           %% {{t,2},4},
            {{t,4},1},
            {{t,6},1},
            {{t,7},0},
@@ -1608,7 +1584,7 @@ comprehension_8188(Cf) ->
            {{t,12},4},
            {{t,13},1}] =
         analyse_expr(<<"<< \n" % 1
-                       " << (2)\n" % 4
+                       " << (2)\n" % 4 (now: 0)
                        "     :(8) >> || \n"
                        "    <<X>> <= << 1,\n" % 1
                        "                (case two() of \n"
@@ -1746,6 +1722,49 @@ line_0(Config) ->
     ok.
 
 
+%% OTP-13200: Return error instead of crashing when trying to compile
+%% a beam which has no 'file' attribute.
+compile_beam_no_file(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    Dir = filename:join(PrivDir,"compile_beam_no_file"),
+    ok = filelib:ensure_dir(filename:join(Dir,"*")),
+    code:add_patha(Dir),
+    Str = lists:concat(
+	    ["-module(nofile).\n"
+	     "-compile(export_all).\n"
+	     "foo() -> ok.\n"]),
+    TT = do_scan(Str),
+    Forms = [ begin {ok,Y} = erl_parse:parse_form(X),Y end || X <- TT ],
+    {ok,_,Bin} = compile:forms(Forms,[debug_info]),
+    BeamFile = filename:join(Dir,"nofile.beam"),
+    ok = file:write_file(BeamFile,Bin),
+    {error,{no_file_attribute,BeamFile}} = cover:compile_beam(nofile),
+    [{error,{no_file_attribute,BeamFile}}] = cover:compile_beam_directory(Dir),
+    ok.
+
+do_scan([]) ->
+    [];
+do_scan(Str) ->
+    {done,{ok,T,_},C} = erl_scan:tokens([],Str,0),
+    [ T | do_scan(C) ].
+
+otp_13277(doc) ->
+    ["PR 856. Fix a bc bug."];
+otp_13277(Config) ->
+    Test = <<"-module(t).
+              -export([t/0]).
+
+              pad(A, L) ->
+                  P = << <<\"#\">> || _ <- lists:seq(1, L) >>,
+                  <<A/binary, P/binary>>.
+
+              t() ->
+                  pad(<<\"hi\">>, 2).
+             ">>,
+    ?line File = cc_mod(t, Test, Config),
+    ?line <<"hi##">> = t:t(),
+    ?line ok = file:delete(File),
+    ok.
 
 %%--Auxiliary------------------------------------------------------------
 
diff --git a/lib/tools/test/cover_SUITE_data/cc.erl b/lib/tools/test/cover_SUITE_data/cc.erl
index 587bdbe493..7eb165ef8a 100644
--- a/lib/tools/test/cover_SUITE_data/cc.erl
+++ b/lib/tools/test/cover_SUITE_data/cc.erl
@@ -1,88 +1,17 @@
 -module(cc).
--export([epp/1, epp/2, dbg/1, dbg/2, cvr/1, cvr/2]).
--export([p/2, pp/2]).
+-compile(export_all).
 
-%% epp(Module) - Creates Module.epp which contains all forms of Module
-%%               as obtained by using epp.
-%%
-%% dbg(Module) - Creates Module.dbg which contains all forms of Module
-%%               as obtained by using beam_lib:chunks/2.
-%%
-%% cvr(Module) - Creates Module.cvr which contains all forms of Module
-%%               as obtained by using cover:transform/3.
-%%
+%% This is a dummy module used only for cover compiling. The content
+%% of this module has no meaning for the test.
 
-epp(Module) ->
-    epp(Module, p).
-epp(Module, P) ->
-    File = atom_to_list(Module)++".erl",
-    {ok,Cwd} = file:get_cwd(),
-    {ok, Fd1} = epp:open(File, [Cwd], []),
-    {ok, Fd2} = file:open(atom_to_list(Module)++".epp", write),
+foo() ->
+    T = erlang:time(),
+    spawn(fun() -> bar(T) end).
 
-    epp(Fd1, Fd2, P),
-    
-    epp:close(Fd1),
-    file:close(Fd2),
-    ok.
-
-epp(Fd1, Fd2, P) ->
-    case epp:parse_erl_form(Fd1) of
-	{ok, {attribute,Line,Attr,Data}} ->
-	    epp(Fd1, Fd2, P);
-	{ok, Form} when P==p ->
-	    io:format(Fd2, "~p.~n", [Form]),
-	    epp(Fd1, Fd2, P);
-	{ok, Form} when P==pp ->
-	    io:format(Fd2, "~p.~n", [erl_pp:form(Form)]),
-	    epp(Fd1, Fd2, P);
-	{eof, Line} ->
-	    ok
-    end.
-
-cvr(Module) ->
-    cvr(Module, p).
-cvr(Module, P) ->
-    case beam_lib:chunks(Module, [abstract_code]) of
-	{ok, {Module, [{abstract_code, no_abstract_code}]}} ->
-	    {error, {no_debug_info,Module}};
-	{ok, {Module, [{abstract_code, {Vsn, Forms}}]}} ->
-	    Vars = {vars,Module,Vsn, [],
-		    undefined, undefined, undefined, undefined, undefined,
-		    undefined,
-		    false},
-	    {ok, TForms, _Vars2} = cover:transform(Forms, [], Vars),
-	    File = atom_to_list(Module)++".cvr",
-	    apply(?MODULE, P, [File, TForms]);
-	Error ->
-	    Error
+bar(T) ->
+    receive
+	X ->
+	    T1 = erlang:time(),
+	    io:format("received ~p at ~p. Last time: ~p~n",[X,T1,T]),
+	    bar(T1)
     end.
-
-dbg(Module) ->
-    dbg(Module, p).
-dbg(Module, P) ->
-    case beam_lib:chunks(Module, [abstract_code]) of
-	{ok, {Module, [{abstract_code, no_abstract_code}]}} ->
-	    {error, {no_debug_info,Module}};
-	{ok, {Module, [{abstract_code, {Vsn, Forms}}]}} ->
-	    File = atom_to_list(Module)++".dbg",
-	    apply(?MODULE, P, [File, Forms]);
-	Error ->
-	    Error
-    end.
-
-p(File, Forms) ->
-    {ok, Fd} = file:open(File, write),
-    lists:foreach(fun(Form) ->
-			  io:format(Fd, "~p.~n", [Form])
-		  end,
-		  Forms),
-    file:close(Fd).
-
-pp(File, Forms) ->
-    {ok, Fd} = file:open(File, write),
-    lists:foreach(fun(Form) ->
-			  io:format(Fd, "~s", [erl_pp:form(Form)])
-		  end,
-		  Forms),
-    file:close(Fd).
diff --git a/lib/tools/test/cover_SUITE_data/d.erl b/lib/tools/test/cover_SUITE_data/d.erl
index 696e27e49b..b1d8ebd62e 100644
--- a/lib/tools/test/cover_SUITE_data/d.erl
+++ b/lib/tools/test/cover_SUITE_data/d.erl
@@ -6,7 +6,7 @@
 	 size/0]).
 -export([init/0]). % spawn
 
--record(person, {name, age, location, moved=false}).
+-record(person, {name, age :: integer(), location, moved=false :: boolean()}).
 
 %%%----------------------------------------------------------------------
 %%% User interface functions
diff --git a/lib/tools/test/cprof_SUITE.erl b/lib/tools/test/cprof_SUITE.erl
index 7b22dea7ed..8beaf4f399 100644
--- a/lib/tools/test/cprof_SUITE.erl
+++ b/lib/tools/test/cprof_SUITE.erl
@@ -42,7 +42,7 @@
 -define(config(A,B),config(A,B)).
 -export([config/2]).
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -endif.
  
 -ifdef(debug).
diff --git a/lib/tools/test/emem_SUITE.erl b/lib/tools/test/emem_SUITE.erl
index 95cda98558..93d21623ce 100644
--- a/lib/tools/test/emem_SUITE.erl
+++ b/lib/tools/test/emem_SUITE.erl
@@ -43,7 +43,7 @@
 
 -include_lib("kernel/include/file.hrl").
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -define(DEFAULT_TIMEOUT, ?t:minutes(5)).
 
diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl
index 5428643667..6274eabc37 100644
--- a/lib/tools/test/eprof_SUITE.erl
+++ b/lib/tools/test/eprof_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(eprof_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	init_per_group/2,end_per_group/2]).
diff --git a/lib/tools/test/fprof_SUITE.erl b/lib/tools/test/fprof_SUITE.erl
index e8f179c630..d1a673d6b7 100644
--- a/lib/tools/test/fprof_SUITE.erl
+++ b/lib/tools/test/fprof_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(fprof_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Test server framework exports
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
diff --git a/lib/tools/test/ignore_cores.erl b/lib/tools/test/ignore_cores.erl
index 13f34cd10f..e40b91392c 100644
--- a/lib/tools/test/ignore_cores.erl
+++ b/lib/tools/test/ignore_cores.erl
@@ -28,7 +28,7 @@
 
 -module(ignore_cores).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -export([init/1, fini/1, setup/3, setup/4, restore/1, dir/1]).
 
diff --git a/lib/tools/test/instrument_SUITE.erl b/lib/tools/test/instrument_SUITE.erl
index 3b981a9303..773d805cd0 100644
--- a/lib/tools/test/instrument_SUITE.erl
+++ b/lib/tools/test/instrument_SUITE.erl
@@ -25,7 +25,7 @@
 
 -export(['+Mim true'/1, '+Mis true'/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 init_per_testcase(_Case, Config) ->
     ?line Dog=?t:timetrap(10000),
diff --git a/lib/tools/test/lcnt_SUITE.erl b/lib/tools/test/lcnt_SUITE.erl
index f3789a4137..47b8031bee 100644
--- a/lib/tools/test/lcnt_SUITE.erl
+++ b/lib/tools/test/lcnt_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 
 -module(lcnt_SUITE).
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Test server specific exports
 -export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
diff --git a/lib/tools/test/make_SUITE.erl b/lib/tools/test/make_SUITE.erl
index 70bc8502bf..fdcc310df1 100644
--- a/lib/tools/test/make_SUITE.erl
+++ b/lib/tools/test/make_SUITE.erl
@@ -25,7 +25,7 @@
 	 otp_6057_a/1, otp_6057_b/1, otp_6057_c/1,
 	 otp_6057_end/1]).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 -include_lib("kernel/include/file.hrl").
 
diff --git a/lib/tools/test/tools_SUITE.erl b/lib/tools/test/tools_SUITE.erl
index 9403124c96..ae2a69305b 100644
--- a/lib/tools/test/tools_SUITE.erl
+++ b/lib/tools/test/tools_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 -module(tools_SUITE).
 
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl
index ad47b31443..53aa80d2a3 100644
--- a/lib/tools/test/xref_SUITE.erl
+++ b/lib/tools/test/xref_SUITE.erl
@@ -30,7 +30,7 @@
 -define(privdir, "xref_SUITE_priv").
 -define(copydir, "xref_SUITE_priv/datacopy").
 -else.
--include_lib("test_server/include/test_server.hrl").
+-include_lib("common_test/include/ct.hrl").
 -define(format(S, A), ok).
 -define(datadir, ?config(data_dir, Conf)).
 -define(privdir, ?config(priv_dir, Conf)).
@@ -1151,17 +1151,13 @@ read_expected(Version) ->
 	  {POS8+4,{FF,{a,b,1}}},
 	  {POS8+4,{FF,{erlang,apply,2}}},
 	  {POS8+5,{FF,{erlang,apply,2}}},
-	  {POS8+6,{FF,{erlang,apply,3}}},
 	  {POS8+6,{FF,{m,f,1}}},
-	  {POS8+7,{FF,{erlang,apply,3}}},
-	  {POS9+1,{FF,{erlang,apply,3}}},
 	  {POS9+1,{FF,{read,bi,0}}},
 	  {POS9+2,{FF,{a,b,1}}},
 	  {POS9+2,{FF,{erlang,apply,2}}},
 	  {POS9+3,{FF,{erlang,apply,2}}},
 	  {POS9+4,{FF,{erlang,apply,2}}},
 	  {POS9+4,{FF,{erlang,not_a_function,1}}},
-	  {POS9+5,{FF,{erlang,apply,3}}},
 	  {POS9+5,{FF,{mod,func,2}}},
 	  {POS9+6,{FF,{erlang,apply,1}}},
 	  {POS9+7,{FF,{erlang,apply,2}}},
@@ -1169,17 +1165,11 @@ read_expected(Version) ->
 	  {POS9+8,{FF,{q,f,1}}},
 	  {POS10+4,{FF,{erlang,apply,2}}},
 	  {POS10+5,{FF,{mod1,fun1,1}}},
-	  {POS11+1,{FF,{erlang,apply,3}}},
-	  {POS11+2,{FF,{erlang,apply,3}}},
-	  {POS11+3,{FF,{erlang,apply,3}}},
-	  {POS11+4,{FF,{erlang,apply,3}}},
 	  {POS11+6,{FF,{erlang,apply,2}}},
 	  {POS12+1,{FF,{erlang,apply,2}}},
 	  {POS12+4,{FF,{erlang,apply,2}}},
-	  {POS12+5,{FF,{erlang,apply,3}}},
 	  {POS12+5,{FF,{m3,f3,2}}},
 	  {POS12+7,{FF,{erlang,apply,2}}},
-	  {POS12+8,{FF,{erlang,apply,3}}},
 	  {POS13+1,{FF,{dm,df,1}}},
 	  {POS13+6,{{read,bi,0},{foo,module_info,0}}},
 	  {POS13+7,{{read,bi,0},{read,module_info,0}}},
@@ -1189,10 +1179,6 @@ read_expected(Version) ->
 
     OK = case Version of
 	     abstract_v1 ->
-		 [{POS8+3, {FF,{erlang,apply,3}}},
-		  {POS10+1, {FF,{erlang,apply,3}}},
-		  {POS10+6, {FF,{erlang,apply,3}}}]
-                 ++
                  [{0,{FF,{read,'$F_EXPR',178}}},
                   {0,{FF,{modul,'$F_EXPR',179}}}]
                  ++ O1;
@@ -1213,13 +1199,25 @@ read_expected(Version) ->
             {POS3+3,  {FF,{erlang,spawn_link,3}}},
             {POS3+4, {FF,{erlang,spawn_link,3}}},
             {POS6+4, {FF,{erlang,spawn,3}}},
+	    {POS8+6,{FF,{erlang,apply,3}}},
+	    {POS8+7,{FF,{erlang,apply,3}}},
+	    {POS9+1,{FF,{erlang,apply,3}}},
+	    {POS9+5,{FF,{erlang,apply,3}}},
+	    {POS11+1,{FF,{erlang,apply,3}}},
+	    {POS11+2,{FF,{erlang,apply,3}}},
+	    {POS11+3,{FF,{erlang,apply,3}}},
+	    {POS11+4,{FF,{erlang,apply,3}}},
+	    {POS12+5,{FF,{erlang,apply,3}}},
+	    {POS12+8,{FF,{erlang,apply,3}}},
             {POS13+5, {{read,bi,0},{erlang,length,1}}},
             {POS14+3, {{read,bi,0},{erlang,length,1}}}],
 
     %% Operators (OTP-8647):
     OKB = case Version of
               abstract_v1 ->
-                  [];
+		  [{POS8+3, {FF,{erlang,apply,3}}},
+		   {POS10+1, {FF,{erlang,apply,3}}},
+		   {POS10+6, {FF,{erlang,apply,3}}}];
               _ ->
                   [{POS13+16, {{read,bi,0},{erlang,'!',2}}},
                    {POS13+16, {{read,bi,0},{erlang,'-',1}}},