Remove ?line macros

1 files changed, 116 insertions, 135 deletions

diff --git a/erts/emulator/test/save_calls_SUITE.erl b/erts/emulator/test/save_calls_SUITE.erl
index 3dfd9a16a8..bbdc2e6688 100644
--- a/erts/emulator/test/save_calls_SUITE.erl
+++ b/erts/emulator/test/save_calls_SUITE.erl
@@ -22,10 +22,7 @@
 
 -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,
-	 init_per_testcase/2,end_per_testcase/2]).
+-export([all/0, suite/0, init_per_testcase/2,end_per_testcase/2]).
 
 -export([save_calls_1/1,dont_break_reductions/1]).
 
@@ -36,36 +33,21 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 all() -> 
     [save_calls_1, dont_break_reductions].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
 init_per_testcase(dont_break_reductions,Config) ->
     %% Skip on --enable-native-libs as hipe rescedules after each
     %% function call.
     case erlang:system_info(hipe_architecture) of
-	undefined ->
-	    Config;
-	Architecture ->
-	    {lists, ListsBinary, _ListsFilename} = code:get_object_code(lists),
-	    ChunkName = hipe_unified_loader:chunk_name(Architecture),
-	    NativeChunk = beam_lib:chunks(ListsBinary, [ChunkName]),
-	    case NativeChunk of
-		{ok,{_,[{_,Bin}]}} when is_binary(Bin) ->
-		    {skip,"Does not work for --enable-native-libs"};
-		{error, beam_lib, _} -> Config
-	    end
+        undefined ->
+            Config;
+        Architecture ->
+            {lists, ListsBinary, _ListsFilename} = code:get_object_code(lists),
+            ChunkName = hipe_unified_loader:chunk_name(Architecture),
+            NativeChunk = beam_lib:chunks(ListsBinary, [ChunkName]),
+            case NativeChunk of
+                {ok,{_,[{_,Bin}]}} when is_binary(Bin) ->
+                    {skip,"Does not work for --enable-native-libs"};
+                {error, beam_lib, _} -> Config
+            end
     end;
 init_per_testcase(_,Config) ->
     Config.
@@ -75,86 +57,86 @@ end_per_testcase(_,_Config) ->
 
 %% Check that save_calls dont break reduction-based scheduling
 dont_break_reductions(Config) when is_list(Config) ->
-    ?line RPS1 = reds_per_sched(0),
-    ?line RPS2 = reds_per_sched(20),
-    ?line Diff = abs(RPS1 - RPS2),
-    ?line true = (Diff < (0.05 * RPS1)),
+    RPS1 = reds_per_sched(0),
+    RPS2 = reds_per_sched(20),
+    Diff = abs(RPS1 - RPS2),
+    true = (Diff < (0.05 * RPS1)),
     ok.
 
 
 reds_per_sched(SaveCalls) ->
-    ?line Parent = self(),
-    ?line HowMany = 10000,
-    ?line Pid = spawn(fun() -> 
-			process_flag(save_calls,SaveCalls), 
-			receive 
-			    go -> 
-				carmichaels_below(HowMany), 
-				Parent ! erlang:process_info(self(),reductions)
-			end 
-		end),
-    ?line TH = spawn(fun() -> trace_handler(0,Parent,Pid) end),
-    ?line erlang:trace(Pid, true,[running,procs,{tracer,TH}]),
-    ?line Pid ! go,
-    ?line {Sched,Reds} = receive 
-		       {accumulated,X} -> 
-			   receive {reductions,Y} -> 
-				   {X,Y} 
-			   after 30000 -> 
-				   timeout 
-			   end 
-		   after 30000 -> 
-			   timeout 
-		   end,
-    ?line Reds div Sched.
+    Parent = self(),
+    HowMany = 10000,
+    Pid = spawn(fun() -> 
+                        process_flag(save_calls,SaveCalls), 
+                        receive 
+                            go -> 
+                                carmichaels_below(HowMany), 
+                                Parent ! erlang:process_info(self(),reductions)
+                        end 
+                end),
+    TH = spawn(fun() -> trace_handler(0,Parent,Pid) end),
+    erlang:trace(Pid, true,[running,procs,{tracer,TH}]),
+    Pid ! go,
+    {Sched,Reds} = receive 
+                       {accumulated,X} -> 
+                           receive {reductions,Y} -> 
+                                       {X,Y} 
+                           after 30000 -> 
+                                     timeout 
+                           end 
+                   after 30000 -> 
+                             timeout 
+                   end,
+    Reds div Sched.
 
 
 
 trace_handler(Acc,Parent,Client) ->
     receive
-	{trace,Client,out,_} ->
-	    trace_handler(Acc+1,Parent,Client);
-	{trace,Client,exit,_} ->
-	    Parent ! {accumulated, Acc};
-	_ ->
-	    trace_handler(Acc,Parent,Client)
+        {trace,Client,out,_} ->
+            trace_handler(Acc+1,Parent,Client);
+        {trace,Client,exit,_} ->
+            Parent ! {accumulated, Acc};
+        _ ->
+            trace_handler(Acc,Parent,Client)
     after 10000 ->
-	    ok
+              ok
     end.
 
 %% Test call saving.
 save_calls_1(Config) when is_list(Config) ->
     case test_server:is_native(?MODULE) of
-	true -> {skipped,"Native code"};
-	false -> save_calls_1()
+        true -> {skipped,"Native code"};
+        false -> save_calls_1()
     end.
-	    
+
 save_calls_1() ->
-    ?line erlang:process_flag(self(), save_calls, 0),
-    ?line {last_calls, false} = process_info(self(), last_calls),
-
-    ?line erlang:process_flag(self(), save_calls, 10),
-    ?line {last_calls, _L1} = process_info(self(), last_calls),
-    ?line ?MODULE:do_bipp(),
-    ?line {last_calls, L2} = process_info(self(), last_calls),
-    ?line L21 = lists:filter(fun is_local_function/1, L2),
-    ?line case L21 of
-	      [{?MODULE,do_bipp,0},
-	       timeout,
-	       'send',
-	       {?MODULE,do_bopp,1},
-	       'receive',
-	       timeout,
-	       {?MODULE,do_bepp,0}] ->
-		  ok;
-	      X ->
-		  ct:fail({l21, X})
-	  end,
-
-    ?line erlang:process_flag(self(), save_calls, 10),
-    ?line {last_calls, L3} = process_info(self(), last_calls),
-    ?line L31 = lists:filter(fun is_local_function/1, L3),
-    ?line [] = L31,
+    erlang:process_flag(self(), save_calls, 0),
+    {last_calls, false} = process_info(self(), last_calls),
+
+    erlang:process_flag(self(), save_calls, 10),
+    {last_calls, _L1} = process_info(self(), last_calls),
+    ?MODULE:do_bipp(),
+    {last_calls, L2} = process_info(self(), last_calls),
+    L21 = lists:filter(fun is_local_function/1, L2),
+    case L21 of
+        [{?MODULE,do_bipp,0},
+         timeout,
+         'send',
+         {?MODULE,do_bopp,1},
+         'receive',
+         timeout,
+         {?MODULE,do_bepp,0}] ->
+            ok;
+        X ->
+            ct:fail({l21, X})
+    end,
+
+    erlang:process_flag(self(), save_calls, 10),
+    {last_calls, L3} = process_info(self(), last_calls),
+    L31 = lists:filter(fun is_local_function/1, L3),
+    [] = L31,
     ok.
 
 do_bipp() ->
@@ -169,7 +151,7 @@ do_bapp() ->
 
 do_bopp(T) ->
     receive
-	X -> X
+        X -> X
     after T -> ok
     end.
 
@@ -193,18 +175,18 @@ carmichaels_below(N,N2) when N >= N2 ->
     0;
 carmichaels_below(N,N2) ->
     X = case fast_prime(N,10) of
-	false -> 0;
-	true ->
-	    case fast_prime2(N,10) of
-		true ->
-		    %io:format("Prime: ~p~n",[N]),
-		    0;
-		false ->
-		    io:format("Carmichael: ~p (dividable by ~p)~n",
-			      [N,smallest_divisor(N)]),
-		    1
-	    end
-    end,
+            false -> 0;
+            true ->
+                case fast_prime2(N,10) of
+                    true ->
+                        %io:format("Prime: ~p~n",[N]),
+                        0;
+                    false ->
+                        io:format("Carmichael: ~p (dividable by ~p)~n",
+                                  [N,smallest_divisor(N)]),
+                        1
+                end
+        end,
     X+carmichaels_below(N+2,N2).
 
 expmod(_,E,_) when E == 0 ->
@@ -228,30 +210,30 @@ do_fast_prime(_N,0) ->
     true;
 do_fast_prime(N,Times) ->
     case fermat(N) of
-	true ->
-	    do_fast_prime(N,Times-1);
-	false ->
-	    false
+        true ->
+            do_fast_prime(N,Times-1);
+        false ->
+            false
     end.
-    
+
 fast_prime(N,T) ->
     do_fast_prime(N,T).
 
 expmod2(_,E,_) when E == 0 ->
     1;
 expmod2(Base,Exp,Mod) when (Exp rem 2) == 0 ->
-%% Uncomment the code below to simulate scheduling bug!
-%     case erlang:process_info(self(),last_calls) of
-% 	{last_calls,false} -> ok;
-% 	_ -> erlang:yield()
-%     end,
+    %% Uncomment the code below to simulate scheduling bug!
+    %     case erlang:process_info(self(),last_calls) of
+    % 	{last_calls,false} -> ok;
+    % 	_ -> erlang:yield()
+    %     end,
     X = expmod2(Base,Exp div 2,Mod),
     Y=(X*X) rem Mod,
     if 
-	Y == 1, X =/= 1, X =/= (Mod - 1) ->
-	    0;
-	true ->
-	    Y rem Mod
+        Y == 1, X =/= 1, X =/= (Mod - 1) ->
+            0;
+        true ->
+            Y rem Mod
     end;
 expmod2(Base,Exp,Mod) -> 
     (Base * expmod2(Base,Exp - 1,Mod)) rem Mod.
@@ -266,12 +248,12 @@ do_fast_prime2(_N,0) ->
     true;
 do_fast_prime2(N,Times) ->
     case miller_rabbin(N) of
-	true ->
-	    do_fast_prime2(N,Times-1);
-	false ->
-	    false
+        true ->
+            do_fast_prime2(N,Times-1);
+        false ->
+            false
     end.
-    
+
 fast_prime2(N,T) ->
     do_fast_prime2(N,T).
 
@@ -280,17 +262,16 @@ smallest_divisor(N) ->
 
 find_divisor(N,TD) ->
     if 
-	TD*TD > N ->
-	    N;
-	true ->
-	    case divides(TD,N) of
-		true ->
-		    TD;
-		false ->
-		    find_divisor(N,TD+1)
-	    end
+        TD*TD > N ->
+            N;
+        true ->
+            case divides(TD,N) of
+                true ->
+                    TD;
+                false ->
+                    find_divisor(N,TD+1)
+            end
     end.
 
 divides(A,B) ->
     (B rem A) == 0.
-