stdlib: Remove ?line macros in filename_SUITE

1 files changed, 448 insertions, 465 deletions

diff --git a/lib/stdlib/test/filename_SUITE.erl b/lib/stdlib/test/filename_SUITE.erl
index 8ecbc7eadf..73ced2ec46 100644
--- a/lib/stdlib/test/filename_SUITE.erl
+++ b/lib/stdlib/test/filename_SUITE.erl
@@ -61,58 +61,59 @@ end_per_group(_GroupName, Config) ->
 
 absname(Config) when is_list(Config) ->
     case os:type() of
-	{win32, _} -> 
-	    ?line [Drive|_] = ?config(priv_dir, Config),
-	    ?line Temp = filename:join([Drive|":/"], "temp"),
-	    ?line case file:make_dir(Temp) of
-		      ok -> ok;
-		      {error,eexist} -> ok
-		  end,
-	    ?line {ok,Cwd} = file:get_cwd(),
-	    ?line ok = file:set_cwd(Temp),
-	    ?line [Drive|":/temp/foo"] = filename:absname(foo),
-	    ?line [Drive|":/temp/foo"] = filename:absname("foo"),
-	    ?line [Drive|":/temp/../ebin"] = filename:absname("../ebin"),
-	    ?line [Drive|":/erlang"] = filename:absname("/erlang"),
-	    ?line [Drive|":/erlang/src"] = filename:absname("/erlang/src"),
-	    ?line [Drive|":/erlang/src"] = filename:absname("\\erlang\\src"),
-	    ?line [Drive|":/temp/erlang"] = filename:absname([Drive|":erlang"]),
-	    ?line [Drive|":/temp/erlang/src"] =
-		filename:absname([Drive|":erlang/src"]),
-	    ?line [Drive|":/temp/erlang/src"] =
-		filename:absname([Drive|":erlang\\src\\"]),
-	    ?line "a:/erlang" = filename:absname("a:erlang"),
-	    
-	    ?line file:set_cwd([Drive|":/"]),
-	    ?line [Drive|":/foo"] = filename:absname(foo),
-	    ?line [Drive|":/foo"] = filename:absname("foo"),
-	    ?line [Drive|":/../ebin"] = filename:absname("../ebin"),
-	    ?line [Drive|":/erlang"] = filename:absname("/erlang"),
-	    ?line [Drive|":/erlang/src"] = filename:absname("/erlang/src"),
-	    ?line [Drive|":/erlang/src"] = filename:absname(["/erlang",'/src']),
-	    ?line [Drive|":/erlang/src"] = filename:absname("\\erlang\\\\src"),
-	    ?line [Drive|":/erlang"] = filename:absname([Drive|":erlang"]),
-	    ?line [Drive|":/erlang/src"] = filename:absname([Drive|":erlang/src"]),
-	    ?line "a:/erlang" = filename:absname("a:erlang"),
-	    
-	    ?line file:set_cwd(Cwd),
-	    ok;
-	{unix, _} ->
-            ?line ok = file:set_cwd("/usr"),
-            ?line "/usr/foo" = filename:absname(foo),
-            ?line "/usr/foo" = filename:absname("foo"),
-            ?line "/usr/../ebin" = filename:absname("../ebin"),
-	    ?line file:set_cwd("/"),
-	    ?line "/foo" = filename:absname(foo),
-	    ?line "/foo" = filename:absname("foo"),
-	    ?line "/../ebin" = filename:absname("../ebin"),
-	    ?line "/erlang" = filename:absname("/erlang"),
-	    ?line "/erlang/src" = filename:absname("/erlang/src"),
-	    ?line "/erlang/src" = filename:absname(["/erl",'ang/s',"rc"]),
-	    ?line "/erlang/src" = filename:absname(["/erl",'a','ng',"/",'s',"rc"]),
-	    ?line "/erlang/src" = filename:absname("/erlang///src"),
-	    ?line "/file_sorter.erl" = filename:absname([file_sorter|'.erl']),
-	    ok
+        {win32, _} -> 
+            [Drive|_] = ?config(priv_dir, Config),
+            Temp = filename:join([Drive|":/"], "temp"),
+            case file:make_dir(Temp) of
+                ok -> ok;
+                {error,eexist} -> ok
+            end,
+            {ok,Cwd} = file:get_cwd(),
+            ok = file:set_cwd(Temp),
+            [Drive|":/temp/foo"] = filename:absname(foo),
+            [Drive|":/temp/foo"] = filename:absname("foo"),
+            [Drive|":/temp/../ebin"] = filename:absname("../ebin"),
+            [Drive|":/erlang"] = filename:absname("/erlang"),
+            [Drive|":/erlang/src"] = filename:absname("/erlang/src"),
+            [Drive|":/erlang/src"] = filename:absname("\\erlang\\src"),
+            [Drive|":/temp/erlang"] = filename:absname([Drive|":erlang"]),
+            [Drive|":/temp/erlang/src"] =
+                filename:absname([Drive|":erlang/src"]),
+            [Drive|":/temp/erlang/src"] =
+                filename:absname([Drive|":erlang\\src\\"]),
+            "a:/erlang" = filename:absname("a:erlang"),
+
+            file:set_cwd([Drive|":/"]),
+            [Drive|":/foo"] = filename:absname(foo),
+            [Drive|":/foo"] = filename:absname("foo"),
+            [Drive|":/../ebin"] = filename:absname("../ebin"),
+            [Drive|":/erlang"] = filename:absname("/erlang"),
+            [Drive|":/erlang/src"] = filename:absname("/erlang/src"),
+            [Drive|":/erlang/src"] = filename:absname(["/erlang",'/src']),
+            [Drive|":/erlang/src"] = filename:absname("\\erlang\\\\src"),
+            [Drive|":/erlang"] = filename:absname([Drive|":erlang"]),
+            [Drive|":/erlang/src"] = filename:absname([Drive|":erlang/src"]),
+            "a:/erlang" = filename:absname("a:erlang"),
+
+            file:set_cwd(Cwd),
+            ok;
+        {unix, _} ->
+            ok = file:set_cwd("/usr"),
+            "/usr/foo" = filename:absname(foo),
+            "/usr/foo" = filename:absname("foo"),
+            "/usr/../ebin" = filename:absname("../ebin"),
+
+            file:set_cwd("/"),
+            "/foo" = filename:absname(foo),
+            "/foo" = filename:absname("foo"),
+            "/../ebin" = filename:absname("../ebin"),
+            "/erlang" = filename:absname("/erlang"),
+            "/erlang/src" = filename:absname("/erlang/src"),
+            "/erlang/src" = filename:absname(["/erl",'ang/s',"rc"]),
+            "/erlang/src" = filename:absname(["/erl",'a','ng',"/",'s',"rc"]),
+            "/erlang/src" = filename:absname("/erlang///src"),
+            "/file_sorter.erl" = filename:absname([file_sorter|'.erl']),
+            ok
     end.
 
 
@@ -120,125 +121,123 @@ absname(Config) when is_list(Config) ->
 
 absname_2(Config) when is_list(Config) ->
     case os:type() of
-	{win32, _} ->
-	    ?line [Drive|_] = ?config(priv_dir, Config),
-	    ?line [Drive|":/temp/foo"] = filename:absname(foo, [Drive|":/temp"]),
-	    ?line [Drive|":/temp/foo"] = filename:absname("foo", [Drive|":/temp"]),
-	    ?line [Drive|":/temp/../ebin"] = filename:absname("../ebin",
-							      [Drive|":/temp"]),
-	    ?line [Drive|":/erlang"] = filename:absname("/erlang", [Drive|":/temp"]),
-	    ?line [Drive|":/erlang/src"] = filename:absname("/erlang/src",
-							    [Drive|":/temp"]),
-	    ?line [Drive|":/erlang/src"] = filename:absname("\\erlang\\src",
-							    [Drive|":/temp"]),
-	    ?line [Drive|":/temp/erlang"] = filename:absname([Drive|":erlang"],
-							     [Drive|":/temp"]),
-	    ?line [Drive|":/temp/erlang/src"] = filename:absname([Drive|":erlang/src"],
-								 [Drive|":/temp"]),
-	    ?line [Drive|":/temp/erlang/src"] =
-		filename:absname([Drive|":erlang\\src\\"], [Drive|":/temp"]),
-	    ?line "a:/erlang" = filename:absname("a:erlang", [Drive|":/temp"]),
-	    
-	    ?line file:set_cwd([Drive|":/"]),
-	    ?line [Drive|":/foo"] = filename:absname(foo, [Drive|":/"]),
-	    ?line [Drive|":/foo"] = filename:absname("foo", [Drive|":/"]),
-	    ?line [Drive|":/../ebin"] = filename:absname("../ebin", [Drive|":/"]),
-	    ?line [Drive|":/erlang"] = filename:absname("/erlang", [Drive|":/"]),
-	    ?line [Drive|":/erlang/src"] = filename:absname("/erlang/src",
-							    [Drive|":/"]),
-	    ?line [Drive|":/erlang/src"] = filename:absname("\\erlang\\\\src",
-							    [Drive|":/"]),
-	    ?line [Drive|":/erlang"] = filename:absname([Drive|":erlang"],
-							[Drive|":/"]),
-	    ?line [Drive|":/erlang/src"] = filename:absname([Drive|":erlang/src"],
-							    [Drive|":/"]),
-	    ?line "a:/erlang" = filename:absname("a:erlang", [Drive|":/"]),
-	    
-	    ok;
-	_ ->
-	    ?line "/usr/foo" = filename:absname(foo, "/usr"),
-	    ?line "/usr/foo" = filename:absname("foo", "/usr"),
-	    ?line "/usr/../ebin" = filename:absname("../ebin", "/usr"),
-	    
-	    ?line "/foo" = filename:absname(foo, "/"),
-	    ?line "/foo" = filename:absname("foo", "/"),
-	    ?line "/../ebin" = filename:absname("../ebin", "/"),
-	    ?line "/erlang" = filename:absname("/erlang", "/"),
-	    ?line "/erlang/src" = filename:absname("/erlang/src", "/"),
-	    ?line "/erlang/src" = filename:absname("/erlang///src", "/"),
-	    ok
+        {win32, _} ->
+            [Drive|_] = ?config(priv_dir, Config),
+            [Drive|":/temp/foo"] = filename:absname(foo, [Drive|":/temp"]),
+            [Drive|":/temp/foo"] = filename:absname("foo", [Drive|":/temp"]),
+            [Drive|":/temp/../ebin"] = filename:absname("../ebin",
+                                                        [Drive|":/temp"]),
+            [Drive|":/erlang"] = filename:absname("/erlang", [Drive|":/temp"]),
+            [Drive|":/erlang/src"] = filename:absname("/erlang/src",
+                                                      [Drive|":/temp"]),
+            [Drive|":/erlang/src"] = filename:absname("\\erlang\\src",
+                                                      [Drive|":/temp"]),
+            [Drive|":/temp/erlang"] = filename:absname([Drive|":erlang"],
+                                                       [Drive|":/temp"]),
+            [Drive|":/temp/erlang/src"] = filename:absname([Drive|":erlang/src"],
+                                                           [Drive|":/temp"]),
+            [Drive|":/temp/erlang/src"] =
+                filename:absname([Drive|":erlang\\src\\"], [Drive|":/temp"]),
+            "a:/erlang" = filename:absname("a:erlang", [Drive|":/temp"]),
+
+            file:set_cwd([Drive|":/"]),
+            [Drive|":/foo"] = filename:absname(foo, [Drive|":/"]),
+            [Drive|":/foo"] = filename:absname("foo", [Drive|":/"]),
+            [Drive|":/../ebin"] = filename:absname("../ebin", [Drive|":/"]),
+            [Drive|":/erlang"] = filename:absname("/erlang", [Drive|":/"]),
+            [Drive|":/erlang/src"] = filename:absname("/erlang/src",
+                                                      [Drive|":/"]),
+            [Drive|":/erlang/src"] = filename:absname("\\erlang\\\\src",
+                                                      [Drive|":/"]),
+            [Drive|":/erlang"] = filename:absname([Drive|":erlang"],
+                                                  [Drive|":/"]),
+            [Drive|":/erlang/src"] = filename:absname([Drive|":erlang/src"],
+                                                      [Drive|":/"]),
+            "a:/erlang" = filename:absname("a:erlang", [Drive|":/"]),
+
+            ok;
+        _ ->
+            "/usr/foo" = filename:absname(foo, "/usr"),
+            "/usr/foo" = filename:absname("foo", "/usr"),
+            "/usr/../ebin" = filename:absname("../ebin", "/usr"),
+
+            "/foo" = filename:absname(foo, "/"),
+            "/foo" = filename:absname("foo", "/"),
+            "/../ebin" = filename:absname("../ebin", "/"),
+            "/erlang" = filename:absname("/erlang", "/"),
+            "/erlang/src" = filename:absname("/erlang/src", "/"),
+            "/erlang/src" = filename:absname("/erlang///src", "/"),
+            ok
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 basename_1(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line "." = filename:basename("."),
-    ?line "foo" = filename:basename("foo"),
-    ?line "foo" = filename:basename("/usr/foo"),
-    ?line "foo.erl" = filename:basename("A:usr/foo.erl"),
-    ?line "foo" = filename:basename('/usr/foo'),
-    ?line "foo" = filename:basename(["/usr","/","f","o","o"]),
-    ?line "foo" = filename:basename(["/usr/",foo]),
-    ?line "foo" = filename:basename(["/usr/f",oo]),
-    ?line "foo" = filename:basename(["usr/", "foo"]),
-    ?line "foo" = filename:basename(["usr/"|foo]),
-    ?line "foo" = filename:basename(["usr/foo/"]),
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line "foo" = filename:basename(["usr\\foo\\"]),
-		  ?line "foo" = filename:basename("A:\\usr\\foo"),
-		  ?line "foo" = filename:basename("A:foo");
-	      _ ->
-		  ?line "strange\\but\\true" =
-		      filename:basename("strange\\but\\true")
-	  end,
-    ?line test_server:timetrap_cancel(Dog),
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    "." = filename:basename("."),
+    "foo" = filename:basename("foo"),
+    "foo" = filename:basename("/usr/foo"),
+    "foo.erl" = filename:basename("A:usr/foo.erl"),
+    "foo" = filename:basename('/usr/foo'),
+    "foo" = filename:basename(["/usr","/","f","o","o"]),
+    "foo" = filename:basename(["/usr/",foo]),
+    "foo" = filename:basename(["/usr/f",oo]),
+    "foo" = filename:basename(["usr/", "foo"]),
+    "foo" = filename:basename(["usr/"|foo]),
+    "foo" = filename:basename(["usr/foo/"]),
+    case os:type() of
+        {win32, _} ->
+            "foo" = filename:basename(["usr\\foo\\"]),
+            "foo" = filename:basename("A:\\usr\\foo"),
+            "foo" = filename:basename("A:foo");
+        _ ->
+            "strange\\but\\true" =
+                filename:basename("strange\\but\\true")
+    end,
+    test_server:timetrap_cancel(Dog),
     ok.
 
 basename_2(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line "." = filename:basename(".", ".erl"),
-    ?line "foo" = filename:basename("foo.erl", ".erl"),
-    ?line "foo" = filename:basename('foo.erl', ".erl"),
-    ?line "foo" = filename:basename("foo.erl", '.erl'),
-    ?line "foo" = filename:basename(["/usr","/","f","oo"], ".erl"),
-    ?line "foo.erl" = filename:basename("/usr/foo.erl", ".hrl"),
-    ?line "foo.erl" = filename:basename("/usr.hrl/foo.erl", ".hrl"),
-    ?line "foo" = filename:basename("/usr.hrl/foo", ".hrl"),
-    ?line "foo" = filename:basename("usr/foo/", ".erl"),
-    ?line "foo.erl" = filename:basename("usr/foo.erl/", ".erl"),
-    ?line "foo.erl" = filename:basename("usr/foo.erl/", '.erl'),
-    ?line "foo" = filename:basename(["/usr",'/','f','oo'], ".erl"),
-    ?line "foo.erl" = filename:basename(["usr/foo.e",'rl/'], ".erl"),
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line "foo" = filename:basename("A:foo", ".erl"),
-		  ?line "foo.erl" = filename:basename("a:\\usr\\foo.erl",
-						      ".hrl"),
-		  ?line "foo.erl" = filename:basename("c:\\usr.hrl\\foo.erl",
-						      ".hrl"),
-		  ?line "foo" = filename:basename("A:\\usr\\foo", ".hrl");
-	      _ ->
-		  ?line "strange\\but\\true" =
-		      filename:basename("strange\\but\\true.erl", ".erl"),
-		  ?line "strange\\but\\true" =
-		      filename:basename("strange\\but\\true", ".erl")
-	  end,
-    ?line test_server:timetrap_cancel(Dog),
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    "." = filename:basename(".", ".erl"),
+    "foo" = filename:basename("foo.erl", ".erl"),
+    "foo" = filename:basename('foo.erl', ".erl"),
+    "foo" = filename:basename("foo.erl", '.erl'),
+    "foo" = filename:basename(["/usr","/","f","oo"], ".erl"),
+    "foo.erl" = filename:basename("/usr/foo.erl", ".hrl"),
+    "foo.erl" = filename:basename("/usr.hrl/foo.erl", ".hrl"),
+    "foo" = filename:basename("/usr.hrl/foo", ".hrl"),
+    "foo" = filename:basename("usr/foo/", ".erl"),
+    "foo.erl" = filename:basename("usr/foo.erl/", ".erl"),
+    "foo.erl" = filename:basename("usr/foo.erl/", '.erl'),
+    "foo" = filename:basename(["/usr",'/','f','oo'], ".erl"),
+    "foo.erl" = filename:basename(["usr/foo.e",'rl/'], ".erl"),
+    case os:type() of
+        {win32, _} ->
+            "foo" = filename:basename("A:foo", ".erl"),
+            "foo.erl" = filename:basename("a:\\usr\\foo.erl", ".hrl"),
+            "foo.erl" = filename:basename("c:\\usr.hrl\\foo.erl", ".hrl"),
+            "foo" = filename:basename("A:\\usr\\foo", ".hrl");
+        _ ->
+            "strange\\but\\true" =
+                filename:basename("strange\\but\\true.erl", ".erl"),
+            "strange\\but\\true" =
+                filename:basename("strange\\but\\true", ".erl")
+    end,
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 dirname(Config) when is_list(Config) ->
     case os:type() of
-       {win32,_} ->
-	    "A:/usr" = filename:dirname("A:/usr/foo.erl"),
-	    "A:usr" = filename:dirname("A:usr/foo.erl"),
-	    "/usr" = filename:dirname("\\usr\\foo.erl"),
-	    "/" = filename:dirname("\\usr"),
-	    "A:" = filename:dirname("A:");
-	_ -> true
+        {win32,_} ->
+            "A:/usr" = filename:dirname("A:/usr/foo.erl"),
+            "A:usr" = filename:dirname("A:usr/foo.erl"),
+            "/usr" = filename:dirname("\\usr\\foo.erl"),
+            "/" = filename:dirname("\\usr"),
+            "A:" = filename:dirname("A:");
+        _ -> true
     end,
     "usr" = filename:dirname("usr///foo.erl"),
     "." = filename:dirname("foo.erl"),
@@ -258,23 +257,22 @@ dirname(Config) when is_list(Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 extension(Config) when is_list(Config) ->
-    ?line ".erl" = filename:extension("A:/usr/foo.erl"),
-    ?line ".erl" = filename:extension("A:/usr/foo.nisse.erl"),
-    ?line ".erl" = filename:extension(["A:/usr/", 'foo.ni', "sse.erl"]),
-    ?line ".erl" = filename:extension(["A:/usr/", 'foo.ni', "sse.e", 'rl']),
-    ?line ".erl" = filename:extension(["A:/usr/", 'foo.ni', "sse.e"|'rl']),
-    ?line ".erl" = filename:extension("A:/usr.bar/foo.nisse.erl"),
-    ?line "" = filename:extension("A:/usr.bar/foo"),
-    ?line "" = filename:extension("A:/usr/foo"),
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line "" = filename:extension("A:\\usr\\foo"),
-		  ?line ".erl" =
-		      filename:extension("A:/usr.bar/foo.nisse.erl"),
-		  ?line "" = filename:extension("A:/usr.bar/foo"),
-		  ok;
-	      _ -> ok
-	  end.
+    ".erl" = filename:extension("A:/usr/foo.erl"),
+    ".erl" = filename:extension("A:/usr/foo.nisse.erl"),
+    ".erl" = filename:extension(["A:/usr/", 'foo.ni', "sse.erl"]),
+    ".erl" = filename:extension(["A:/usr/", 'foo.ni', "sse.e", 'rl']),
+    ".erl" = filename:extension(["A:/usr/", 'foo.ni', "sse.e"|'rl']),
+    ".erl" = filename:extension("A:/usr.bar/foo.nisse.erl"),
+    "" = filename:extension("A:/usr.bar/foo"),
+    "" = filename:extension("A:/usr/foo"),
+    case os:type() of
+        {win32, _} ->
+            "" = filename:extension("A:\\usr\\foo"),
+            ".erl" = filename:extension("A:/usr.bar/foo.nisse.erl"),
+            "" = filename:extension("A:/usr.bar/foo"),
+            ok;
+        _ -> ok
+    end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     
@@ -282,8 +280,8 @@ join(Config) when is_list(Config) ->
     %% Whenever joining two elements, test the equivalence between
     %% join/1 and join/2 (OTP-12158) by using help function
     %% filename_join/2.
-    ?line "/" = filename:join(["/"]),
-    ?line "/" = filename:join(["//"]),
+    "/" = filename:join(["/"]),
+    "/" = filename:join(["//"]),
     "usr/foo.erl" = filename_join("usr","foo.erl"),
     "/src/foo.erl" = filename_join(usr, "/src/foo.erl"),
     "/src/foo.erl" = filename_join("/src/",'foo.erl'),
@@ -291,7 +289,7 @@ join(Config) when is_list(Config) ->
     "/src/foo.erl" = filename_join("usr", "/src/foo.erl"),
 
     %% Make sure that redundant slashes work too.
-    ?line "a/b/c/d/e/f/g" = filename:join(["a//b/c/////d//e/f/g"]),
+    "a/b/c/d/e/f/g" = filename:join(["a//b/c/////d//e/f/g"]),
     "a/b/c/d/e/f/g" = filename_join("a//b/c/", "d//e/f/g"),
     "a/b/c/d/e/f/g" = filename_join("a//b/c", "d//e/f/g"),
     "/d/e/f/g" = filename_join("a//b/c", "/d//e/f/g"),
@@ -324,30 +322,25 @@ join(Config) when is_list(Config) ->
     "/b" = filename_join("/a/","/b/"),
     "/a/b" = filename_join("/a/","b/"),
 
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line "d:/" = filename:join(["D:/"]),
-		  ?line "d:/" = filename:join(["D:\\"]),
-		  "d:/abc" = filename_join("D:/", "abc"),
-		  "d:abc" = filename_join("D:", "abc"),
-		  ?line "a/b/c/d/e/f/g" =
-		      filename:join(["a//b\\c//\\/\\d/\\e/f\\g"]),
-		  ?line "a:usr/foo.erl" =
-		      filename:join(["A:","usr","foo.erl"]),
-		  ?line "/usr/foo.erl" =
-		      filename:join(["A:","/usr","foo.erl"]),
-		  "c:usr" = filename_join("A:","C:usr"),
-		  "a:usr" = filename_join("A:","usr"),
-		  "c:/usr" = filename_join("A:", "C:/usr"),
-		  ?line "c:/usr/foo.erl" =
-		      filename:join(["A:","C:/usr","foo.erl"]),
-		  ?line "c:usr/foo.erl" =
-		      filename:join(["A:","C:usr","foo.erl"]),
-		  ?line "d:/foo" = filename:join([$D, $:, $/, []], "foo"),
-		  ok;
-	      _ ->
-		  ok
-	  end.
+    case os:type() of
+        {win32, _} ->
+            "d:/" = filename:join(["D:/"]),
+            "d:/" = filename:join(["D:\\"]),
+            "d:/abc" = filename_join("D:/", "abc"),
+            "d:abc" = filename_join("D:", "abc"),
+            "a/b/c/d/e/f/g" = filename:join(["a//b\\c//\\/\\d/\\e/f\\g"]),
+            "a:usr/foo.erl" = filename:join(["A:","usr","foo.erl"]),
+            "/usr/foo.erl" = filename:join(["A:","/usr","foo.erl"]),
+            "c:usr" = filename_join("A:","C:usr"),
+            "a:usr" = filename_join("A:","usr"),
+            "c:/usr" = filename_join("A:", "C:/usr"),
+            "c:/usr/foo.erl" = filename:join(["A:","C:/usr","foo.erl"]),
+            "c:usr/foo.erl" = filename:join(["A:","C:usr","foo.erl"]),
+            "d:/foo" = filename:join([$D, $:, $/, []], "foo"),
+            ok;
+        _ ->
+            ok
+    end.
 
 %% Make sure join([A,B]) is equivalent to join(A,B) (OTP-12158)
 filename_join(A,B) ->
@@ -355,92 +348,92 @@ filename_join(A,B) ->
     Res = filename:join([A,B]).
 
 pathtype(Config) when is_list(Config) ->
-    ?line relative = filename:pathtype(".."),
-    ?line relative = filename:pathtype("foo"),
-    ?line relative = filename:pathtype("foo/bar"),
-    ?line relative = filename:pathtype('foo/bar'),
-    ?line relative = filename:pathtype(['f','oo',"/bar"]),
+    relative = filename:pathtype(".."),
+    relative = filename:pathtype("foo"),
+    relative = filename:pathtype("foo/bar"),
+    relative = filename:pathtype('foo/bar'),
+    relative = filename:pathtype(['f','oo',"/bar"]),
     case os:type() of
-	{win32, _} ->
-	    ?line volumerelative = filename:pathtype("/usr/local/bin"),
-	    ?line volumerelative = filename:pathtype("A:usr/local/bin"),
-	    ok;
-	_ ->
-	    ?line absolute = filename:pathtype("/"),
-	    ?line absolute = filename:pathtype("/usr/local/bin"),
-	    ok
+        {win32, _} ->
+            volumerelative = filename:pathtype("/usr/local/bin"),
+            volumerelative = filename:pathtype("A:usr/local/bin"),
+            ok;
+        _ ->
+            absolute = filename:pathtype("/"),
+            absolute = filename:pathtype("/usr/local/bin"),
+            ok
     end.
 
 rootname(Config) when is_list(Config) ->
-    ?line "/jam.src/kalle" = filename:rootname("/jam.src/kalle"),
-    ?line "/jam.src/foo" = filename:rootname("/jam.src/foo.erl"),
-    ?line "/jam.src/foo" = filename:rootname(["/ja",'m.sr',"c/foo.erl"]),
-    ?line "/jam.src/foo" = filename:rootname("/jam.src/foo.erl", ".erl"),
-    ?line "/jam.src/foo.jam" = filename:rootname("/jam.src/foo.jam", ".erl"),
-    ?line "/jam.src/foo.jam" = filename:rootname(["/jam.sr",'c/foo.j',"am"],".erl"),
-    ?line "/jam.src/foo.jam" = filename:rootname(["/jam.sr",'c/foo.j'|am],".erl"),
+    "/jam.src/kalle" = filename:rootname("/jam.src/kalle"),
+    "/jam.src/foo" = filename:rootname("/jam.src/foo.erl"),
+    "/jam.src/foo" = filename:rootname(["/ja",'m.sr',"c/foo.erl"]),
+    "/jam.src/foo" = filename:rootname("/jam.src/foo.erl", ".erl"),
+    "/jam.src/foo.jam" = filename:rootname("/jam.src/foo.jam", ".erl"),
+    "/jam.src/foo.jam" = filename:rootname(["/jam.sr",'c/foo.j',"am"],".erl"),
+    "/jam.src/foo.jam" = filename:rootname(["/jam.sr",'c/foo.j'|am],".erl"),
     ok.
 
 split(Config) when is_list(Config) ->
-    ?line ["/","usr","local","bin"] = filename:split("/usr/local/bin"),
-    ?line ["foo","bar"]= filename:split("foo/bar"),
-    ?line ["foo", "bar", "hello"]= filename:split("foo////bar//hello"),
-    ?line ["foo", "bar", "hello"]= filename:split(["foo//",'//bar//h',"ello"]),
-    ?line ["foo", "bar", "hello"]= filename:split(["foo//",'//bar//h'|ello]),
+    ["/","usr","local","bin"] = filename:split("/usr/local/bin"),
+    ["foo","bar"]= filename:split("foo/bar"),
+    ["foo", "bar", "hello"]= filename:split("foo////bar//hello"),
+    ["foo", "bar", "hello"]= filename:split(["foo//",'//bar//h',"ello"]),
+    ["foo", "bar", "hello"]= filename:split(["foo//",'//bar//h'|ello]),
     ["/"] = filename:split("/"),
     [] = filename:split(""),
     case os:type() of
-       {win32,_} ->
-	    ?line ["a:/","msdev","include"] =
-		filename:split("a:/msdev/include"),
-	    ?line ["a:/","msdev","include"] =
-		filename:split("A:/msdev/include"),
-	    ?line ["msdev","include"] =
-		filename:split("msdev\\include"),
-	    ?line ["a:/","msdev","include"] =
-		filename:split("a:\\msdev\\include"),
-	    ?line ["a:","msdev","include"] =
-		filename:split("a:msdev\\include"),
-	    ok;
-       _ ->
+        {win32,_} ->
+            ["a:/","msdev","include"] =
+                filename:split("a:/msdev/include"),
+            ["a:/","msdev","include"] =
+                filename:split("A:/msdev/include"),
+            ["msdev","include"] =
+                filename:split("msdev\\include"),
+            ["a:/","msdev","include"] =
+                filename:split("a:\\msdev\\include"),
+            ["a:","msdev","include"] =
+                filename:split("a:msdev\\include"),
+            ok;
+        _ ->
 	    ok
     end.
 
 t_nativename(Config) when is_list(Config) ->
-    ?line "abcedf" = filename:nativename(abcedf),
-    ?line "abcedf" = filename:nativename(["abc", "edf"]),
-    ?line "abcgluff" = filename:nativename(["abc", gluff]),
+    "abcedf" = filename:nativename(abcedf),
+    "abcedf" = filename:nativename(["abc", "edf"]),
+    "abcgluff" = filename:nativename(["abc", gluff]),
     case os:type() of
-	{win32, _} ->
-	    ?line "a:\\temp\\arne.exe" =
-		filename:nativename("A:/temp//arne.exe/");
-	_ ->
-	    ?line "/usr/tmp/arne" =
-		filename:nativename("/usr/tmp//arne/")
+        {win32, _} ->
+            "a:\\temp\\arne.exe" =
+                filename:nativename("A:/temp//arne.exe/");
+        _ ->
+            "/usr/tmp/arne" =
+                filename:nativename("/usr/tmp//arne/")
     end.
 
 find_src(Config) when is_list(Config) ->
-    ?line {Source,_} = filename:find_src(file),
-    ?line ["file"|_] = lists:reverse(filename:split(Source)),
-    ?line {_,_} = filename:find_src(init, [{".","."}, {"ebin","src"}]),
+    {Source,_} = filename:find_src(file),
+    ["file"|_] = lists:reverse(filename:split(Source)),
+    {_,_} = filename:find_src(init, [{".","."}, {"ebin","src"}]),
     
     %% Try to find the source for a preloaded module.
-    ?line {error,{preloaded,init}} = filename:find_src(init),
+    {error,{preloaded,init}} = filename:find_src(init),
 
     %% Make sure that find_src works for a slim BEAM file.
     OldPath = code:get_path(),
     try
-	PrivDir = ?config(priv_dir, Config),
-	code:add_patha(PrivDir),
-	Src = "simple",
-	SrcPath = filename:join(PrivDir, Src) ++ ".erl",
-	SrcContents = "-module(simple).\n",
-	ok = file:write_file(SrcPath, SrcContents),
-	{ok,simple} = compile:file(SrcPath, [slim,{outdir,PrivDir}]),
-	BeamPath = filename:join(PrivDir, Src),
-	{BeamPath,[]} = filename:find_src(simple)
+        PrivDir = ?config(priv_dir, Config),
+        code:add_patha(PrivDir),
+        Src = "simple",
+        SrcPath = filename:join(PrivDir, Src) ++ ".erl",
+        SrcContents = "-module(simple).\n",
+        ok = file:write_file(SrcPath, SrcContents),
+        {ok,simple} = compile:file(SrcPath, [slim,{outdir,PrivDir}]),
+        BeamPath = filename:join(PrivDir, Src),
+        {BeamPath,[]} = filename:find_src(simple)
     after
-	code:set_path(OldPath)
+        code:set_path(OldPath)
     end,
     ok.
 
@@ -452,50 +445,51 @@ find_src(Config) when is_list(Config) ->
 
 absname_bin(Config) when is_list(Config) ->
     case os:type() of
-	{win32, _} -> 
-	    ?line [Drive|_] = ?config(priv_dir, Config),
-	    ?line Temp = filename:join([Drive|":/"], "temp"),
-	    ?line case file:make_dir(Temp) of
-		      ok -> ok;
-		      {error,eexist} -> ok
-		  end,
-	    ?line {ok,Cwd} = file:get_cwd(),
-	    ?line ok = file:set_cwd(Temp),
-	    ?line <<Drive:8,":/temp/foo">> = filename:absname(<<"foo">>),
-	    ?line <<Drive:8,":/temp/../ebin">> = filename:absname(<<"../ebin">>),
-	    ?line <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\src">>),
-	    ?line <<Drive:8,":/temp/erlang">> = filename:absname(<<Drive:8,":erlang">>),
-	    ?line <<Drive:8,":/temp/erlang/src">> =
-		filename:absname(<<Drive:8,":erlang/src">>),
-	    ?line <<Drive:8,":/temp/erlang/src">> =
-		filename:absname(<<Drive:8,":erlang\\src\\">>),
-	    ?line <<"a:/erlang">> = filename:absname(<<"a:erlang">>),
-	    
-	    ?line file:set_cwd(<<Drive:8,":/">>),
-	    ?line <<Drive:8,":/foo">> = filename:absname(<<"foo">>),
-	    ?line <<Drive:8,":/../ebin">> = filename:absname(<<"../ebin">>),
-	    ?line <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\\\src">>),
-	    ?line <<Drive:8,":/erlang">> = filename:absname(<<Drive:8,":erlang">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<Drive:8,":erlang/src">>),
-	    ?line <<"a:/erlang">> = filename:absname(<<"a:erlang">>),
-	    
-	    ?line file:set_cwd(Cwd),
-	    ok;
-	{unix, _} ->
-            ?line ok = file:set_cwd(<<"/usr">>),
-            ?line <<"/usr/foo">> = filename:absname(<<"foo">>),
-            ?line <<"/usr/../ebin">> = filename:absname(<<"../ebin">>),
-	    ?line file:set_cwd(<<"/">>),
-	    ?line <<"/foo">> = filename:absname(<<"foo">>),
-	    ?line <<"/../ebin">> = filename:absname(<<"../ebin">>),
-	    ?line <<"/erlang">> = filename:absname(<<"/erlang">>),
-	    ?line <<"/erlang/src">> = filename:absname(<<"/erlang/src">>),
-	    ?line <<"/erlang/src">> = filename:absname(<<"/erlang///src">>),
-	    ok
+        {win32, _} -> 
+            [Drive|_] = ?config(priv_dir, Config),
+            Temp = filename:join([Drive|":/"], "temp"),
+            case file:make_dir(Temp) of
+                ok -> ok;
+                {error,eexist} -> ok
+            end,
+            {ok,Cwd} = file:get_cwd(),
+            ok = file:set_cwd(Temp),
+            <<Drive:8,":/temp/foo">> = filename:absname(<<"foo">>),
+            <<Drive:8,":/temp/../ebin">> = filename:absname(<<"../ebin">>),
+            <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\src">>),
+            <<Drive:8,":/temp/erlang">> = filename:absname(<<Drive:8,":erlang">>),
+            <<Drive:8,":/temp/erlang/src">> =
+            filename:absname(<<Drive:8,":erlang/src">>),
+            <<Drive:8,":/temp/erlang/src">> =
+            filename:absname(<<Drive:8,":erlang\\src\\">>),
+            <<"a:/erlang">> = filename:absname(<<"a:erlang">>),
+
+            file:set_cwd(<<Drive:8,":/">>),
+            <<Drive:8,":/foo">> = filename:absname(<<"foo">>),
+            <<Drive:8,":/../ebin">> = filename:absname(<<"../ebin">>),
+            <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\\\src">>),
+            <<Drive:8,":/erlang">> = filename:absname(<<Drive:8,":erlang">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<Drive:8,":erlang/src">>),
+            <<"a:/erlang">> = filename:absname(<<"a:erlang">>),
+
+            file:set_cwd(Cwd),
+            ok;
+        {unix,_} ->
+            ok = file:set_cwd(<<"/usr">>),
+            <<"/usr/foo">> = filename:absname(<<"foo">>),
+            <<"/usr/../ebin">> = filename:absname(<<"../ebin">>),
+
+            file:set_cwd(<<"/">>),
+            <<"/foo">> = filename:absname(<<"foo">>),
+            <<"/../ebin">> = filename:absname(<<"../ebin">>),
+            <<"/erlang">> = filename:absname(<<"/erlang">>),
+            <<"/erlang/src">> = filename:absname(<<"/erlang/src">>),
+            <<"/erlang/src">> = filename:absname(<<"/erlang///src">>),
+            ok
     end.
 
 
@@ -503,108 +497,104 @@ absname_bin(Config) when is_list(Config) ->
 
 absname_bin_2(Config) when is_list(Config) ->
     case os:type() of
-	{win32, _} ->
-	    ?line [Drive|_] = ?config(priv_dir, Config),
-	    ?line <<Drive:8,":/temp/foo">> = filename:absname(<<"foo">>, <<Drive:8,":/temp">>),
-	    ?line <<Drive:8,":/temp/../ebin">> = filename:absname(<<"../ebin">>,
-							      <<Drive:8,":/temp">>),
-	    ?line <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>, <<Drive:8,":/temp">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>,
-							    <<Drive:8,":/temp">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\src">>,
-							    <<Drive:8,":/temp">>),
-	    ?line <<Drive:8,":/temp/erlang">> = filename:absname(<<Drive:8,":erlang">>,
-							     <<Drive:8,":/temp">>),
-	    ?line <<Drive:8,":/temp/erlang/src">> = filename:absname(<<Drive:8,":erlang/src">>,
-								 <<Drive:8,":/temp">>),
-	    ?line <<Drive:8,":/temp/erlang/src">> =
-		filename:absname(<<Drive:8,":erlang\\src\\">>, <<Drive:8,":/temp">>),
-	    ?line <<"a:/erlang">> = filename:absname(<<"a:erlang">>, <<Drive:8,":/temp">>),
-	    
-	    ?line file:set_cwd(<<Drive:8,":/">>),
-	    ?line <<Drive:8,":/foo">> = filename:absname(foo, <<Drive:8,":/">>),
-	    ?line <<Drive:8,":/foo">> = filename:absname(<<"foo">>, <<Drive:8,":/">>),
-	    ?line <<Drive:8,":/../ebin">> = filename:absname(<<"../ebin">>, <<Drive:8,":/">>),
-	    ?line <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>, <<Drive:8,":/">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>,
-							    <<Drive:8,":/">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\\\src">>,
-							    <<Drive:8,":/">>),
-	    ?line <<Drive:8,":/erlang">> = filename:absname(<<Drive:8,":erlang">>,
-							<<Drive:8,":/">>),
-	    ?line <<Drive:8,":/erlang/src">> = filename:absname(<<Drive:8,":erlang/src">>,
-							    <<Drive:8,":/">>),
-	    ?line <<"a:/erlang">> = filename:absname(<<"a:erlang">>, <<Drive:8,":/">>),
-	    
-	    ok;
-	_ ->
-	    ?line <<"/usr/foo">> = filename:absname(<<"foo">>, <<"/usr">>),
-	    ?line <<"/usr/../ebin">> = filename:absname(<<"../ebin">>, <<"/usr">>),
-	    
-	    ?line <<"/foo">> = filename:absname(<<"foo">>, <<"/">>),
-	    ?line <<"/../ebin">> = filename:absname(<<"../ebin">>, <<"/">>),
-	    ?line <<"/erlang">> = filename:absname(<<"/erlang">>, <<"/">>),
-	    ?line <<"/erlang/src">> = filename:absname(<<"/erlang/src">>, <<"/">>),
-	    ?line <<"/erlang/src">> = filename:absname(<<"/erlang///src">>, <<"/">>),
-	    ok
+        {win32, _} ->
+            [Drive|_] = ?config(priv_dir, Config),
+            <<Drive:8,":/temp/foo">> = filename:absname(<<"foo">>, <<Drive:8,":/temp">>),
+            <<Drive:8,":/temp/../ebin">> = filename:absname(<<"../ebin">>,
+                                                            <<Drive:8,":/temp">>),
+            <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>, <<Drive:8,":/temp">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>,
+                                                          <<Drive:8,":/temp">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\src">>,
+                                                          <<Drive:8,":/temp">>),
+            <<Drive:8,":/temp/erlang">> = filename:absname(<<Drive:8,":erlang">>,
+                                                           <<Drive:8,":/temp">>),
+            <<Drive:8,":/temp/erlang/src">> = filename:absname(<<Drive:8,":erlang/src">>,
+                                                               <<Drive:8,":/temp">>),
+            <<Drive:8,":/temp/erlang/src">> =
+                filename:absname(<<Drive:8,":erlang\\src\\">>, <<Drive:8,":/temp">>),
+            <<"a:/erlang">> = filename:absname(<<"a:erlang">>, <<Drive:8,":/temp">>),
+
+            file:set_cwd(<<Drive:8,":/">>),
+            <<Drive:8,":/foo">> = filename:absname(foo, <<Drive:8,":/">>),
+            <<Drive:8,":/foo">> = filename:absname(<<"foo">>, <<Drive:8,":/">>),
+            <<Drive:8,":/../ebin">> = filename:absname(<<"../ebin">>, <<Drive:8,":/">>),
+            <<Drive:8,":/erlang">> = filename:absname(<<"/erlang">>, <<Drive:8,":/">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<"/erlang/src">>,
+                                                          <<Drive:8,":/">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<"\\erlang\\\\src">>,
+                                                          <<Drive:8,":/">>),
+            <<Drive:8,":/erlang">> = filename:absname(<<Drive:8,":erlang">>,
+                                                      <<Drive:8,":/">>),
+            <<Drive:8,":/erlang/src">> = filename:absname(<<Drive:8,":erlang/src">>,
+                                                          <<Drive:8,":/">>),
+            <<"a:/erlang">> = filename:absname(<<"a:erlang">>, <<Drive:8,":/">>),
+
+            ok;
+        _ ->
+            <<"/usr/foo">> = filename:absname(<<"foo">>, <<"/usr">>),
+            <<"/usr/../ebin">> = filename:absname(<<"../ebin">>, <<"/usr">>),
+            <<"/foo">> = filename:absname(<<"foo">>, <<"/">>),
+            <<"/../ebin">> = filename:absname(<<"../ebin">>, <<"/">>),
+            <<"/erlang">> = filename:absname(<<"/erlang">>, <<"/">>),
+            <<"/erlang/src">> = filename:absname(<<"/erlang/src">>, <<"/">>),
+            <<"/erlang/src">> = filename:absname(<<"/erlang///src">>, <<"/">>),
+            ok
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 basename_bin_1(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line <<".">> = filename:basename(<<".">>),
-    ?line <<"foo">> = filename:basename(<<"foo">>),
-    ?line <<"foo">> = filename:basename(<<"/usr/foo">>),
-    ?line <<"foo.erl">> = filename:basename(<<"A:usr/foo.erl">>),
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line <<"foo">> = filename:basename(<<"A:\\usr\\foo">>),
-		  ?line <<"foo">> = filename:basename(<<"A:foo">>);
-	      _ ->
-		  ?line <<"strange\\but\\true">> =
-		      filename:basename(<<"strange\\but\\true">>)
-	  end,
-    ?line test_server:timetrap_cancel(Dog),
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    <<".">> = filename:basename(<<".">>),
+    <<"foo">> = filename:basename(<<"foo">>),
+    <<"foo">> = filename:basename(<<"/usr/foo">>),
+    <<"foo.erl">> = filename:basename(<<"A:usr/foo.erl">>),
+    case os:type() of
+        {win32, _} ->
+            <<"foo">> = filename:basename(<<"A:\\usr\\foo">>),
+            <<"foo">> = filename:basename(<<"A:foo">>);
+        _ ->
+            <<"strange\\but\\true">> = filename:basename(<<"strange\\but\\true">>)
+    end,
+    test_server:timetrap_cancel(Dog),
     ok.
 
 basename_bin_2(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:seconds(10)),
-    ?line <<".">> = filename:basename(<<".">>, <<".erl">>),
-    ?line <<"foo">> = filename:basename(<<"foo.erl">>, <<".erl">>),
-    ?line <<"foo.erl">> = filename:basename(<<"/usr/foo.erl">>, <<".hrl">>),
-    ?line <<"foo.erl">> = filename:basename(<<"/usr.hrl/foo.erl">>, <<".hrl">>),
-    ?line <<"foo">> = filename:basename(<<"/usr.hrl/foo">>, <<".hrl">>),
-    ?line <<"foo">> = filename:basename(<<"usr/foo/">>, <<".erl">>),
-    ?line <<"foo.erl">> = filename:basename(<<"usr/foo.erl/">>, <<".erl">>),
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line <<"foo">> = filename:basename(<<"A:foo">>, <<".erl">>),
-		  ?line <<"foo.erl">> = filename:basename(<<"a:\\usr\\foo.erl">>,
-						      <<".hrl">>),
-		  ?line <<"foo.erl">> = filename:basename(<<"c:\\usr.hrl\\foo.erl">>,
-						      <<".hrl">>),
-		  ?line <<"foo">> = filename:basename(<<"A:\\usr\\foo">>, <<".hrl">>);
-	      _ ->
-		  ?line <<"strange\\but\\true">> =
-		      filename:basename(<<"strange\\but\\true.erl">>, <<".erl">>),
-		  ?line <<"strange\\but\\true">> =
-		      filename:basename(<<"strange\\but\\true">>, <<".erl">>)
-	  end,
-    ?line test_server:timetrap_cancel(Dog),
+    Dog = test_server:timetrap(test_server:seconds(10)),
+    <<".">> = filename:basename(<<".">>, <<".erl">>),
+    <<"foo">> = filename:basename(<<"foo.erl">>, <<".erl">>),
+    <<"foo.erl">> = filename:basename(<<"/usr/foo.erl">>, <<".hrl">>),
+    <<"foo.erl">> = filename:basename(<<"/usr.hrl/foo.erl">>, <<".hrl">>),
+    <<"foo">> = filename:basename(<<"/usr.hrl/foo">>, <<".hrl">>),
+    <<"foo">> = filename:basename(<<"usr/foo/">>, <<".erl">>),
+    <<"foo.erl">> = filename:basename(<<"usr/foo.erl/">>, <<".erl">>),
+    case os:type() of
+        {win32, _} ->
+            <<"foo">> = filename:basename(<<"A:foo">>, <<".erl">>),
+            <<"foo.erl">> = filename:basename(<<"a:\\usr\\foo.erl">>, <<".hrl">>),
+            <<"foo.erl">> = filename:basename(<<"c:\\usr.hrl\\foo.erl">>, <<".hrl">>),
+            <<"foo">> = filename:basename(<<"A:\\usr\\foo">>, <<".hrl">>);
+        _ ->
+            <<"strange\\but\\true">> =
+                filename:basename(<<"strange\\but\\true.erl">>, <<".erl">>),
+            <<"strange\\but\\true">> =
+                filename:basename(<<"strange\\but\\true">>, <<".erl">>)
+    end,
+    test_server:timetrap_cancel(Dog),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 dirname_bin(Config) when is_list(Config) ->
     case os:type() of
-       {win32,_} ->
-	    <<"A:/usr">> = filename:dirname(<<"A:/usr/foo.erl">>),
-	    <<"A:usr">> = filename:dirname(<<"A:usr/foo.erl">>),
-	    <<"/usr">> = filename:dirname(<<"\\usr\\foo.erl">>),
-	    <<"/">> = filename:dirname(<<"\\usr">>),
-	    <<"A:">> = filename:dirname(<<"A:">>);
-	_ -> true
+        {win32,_} ->
+            <<"A:/usr">> = filename:dirname(<<"A:/usr/foo.erl">>),
+            <<"A:usr">> = filename:dirname(<<"A:usr/foo.erl">>),
+            <<"/usr">> = filename:dirname(<<"\\usr\\foo.erl">>),
+            <<"/">> = filename:dirname(<<"\\usr">>),
+            <<"A:">> = filename:dirname(<<"A:">>);
+        _ -> true
     end,
     <<"usr">> = filename:dirname(<<"usr///foo.erl">>),
     <<".">> = filename:dirname(<<"foo.erl">>),
@@ -612,7 +602,6 @@ dirname_bin(Config) when is_list(Config) ->
     <<"/">> = filename:dirname(<<"/">>),
     <<"/">> = filename:dirname(<<"/usr">>),
     ok.
-    
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -624,10 +613,9 @@ extension_bin(Config) when is_list(Config) ->
     <<"">> = filename:extension(<<"A:/usr/foo">>),
     case os:type() of
         {win32, _} ->
-            ?line <<"">> = filename:extension(<<"A:\\usr\\foo">>),
-            ?line <<".erl">> =
-                filename:extension(<<"A:/usr.bar/foo.nisse.erl">>),
-            ?line <<"">> = filename:extension(<<"A:/usr.bar/foo">>),
+            <<"">> = filename:extension(<<"A:\\usr\\foo">>),
+            <<".erl">> = filename:extension(<<"A:/usr.bar/foo.nisse.erl">>),
+            <<"">> = filename:extension(<<"A:/usr.bar/foo">>),
             ok;
         _ -> ok
     end.
@@ -635,22 +623,22 @@ extension_bin(Config) when is_list(Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     
 join_bin(Config) when is_list(Config) ->
-    ?line <<"/">> = filename:join([<<"/">>]),
-    ?line <<"/">> = filename:join([<<"//">>]),
-    ?line <<"usr/foo.erl">> = filename:join(<<"usr">>,<<"foo.erl">>),
-    ?line <<"/src/foo.erl">> = filename:join(usr, <<"/src/foo.erl">>),
-    ?line <<"/src/foo.erl">> = filename:join([<<"/src/">>,'foo.erl']),
-    ?line <<"/src/foo.erl">> = filename:join(<<"usr">>, ["/sr", 'c/foo.erl']),
-    ?line <<"/src/foo.erl">> = filename:join(<<"usr">>, <<"/src/foo.erl">>),
+    <<"/">> = filename:join([<<"/">>]),
+    <<"/">> = filename:join([<<"//">>]),
+    <<"usr/foo.erl">> = filename:join(<<"usr">>,<<"foo.erl">>),
+    <<"/src/foo.erl">> = filename:join(usr, <<"/src/foo.erl">>),
+    <<"/src/foo.erl">> = filename:join([<<"/src/">>,'foo.erl']),
+    <<"/src/foo.erl">> = filename:join(<<"usr">>, ["/sr", 'c/foo.erl']),
+    <<"/src/foo.erl">> = filename:join(<<"usr">>, <<"/src/foo.erl">>),
 
     %% Make sure that redundant slashes work too.
-    ?line <<"a/b/c/d/e/f/g">> = filename:join([<<"a//b/c/////d//e/f/g">>]),
-    ?line <<"a/b/c/d/e/f/g">> = filename:join([<<"a//b/c/">>, <<"d//e/f/g">>]),
-    ?line <<"a/b/c/d/e/f/g">> = filename:join([<<"a//b/c">>, <<"d//e/f/g">>]),
-    ?line <<"/d/e/f/g">> = filename:join([<<"a//b/c">>, <<"/d//e/f/g">>]),
-    ?line <<"/d/e/f/g">> = filename:join([<<"a//b/c">>, <<"//d//e/f/g">>]),
+    <<"a/b/c/d/e/f/g">> = filename:join([<<"a//b/c/////d//e/f/g">>]),
+    <<"a/b/c/d/e/f/g">> = filename:join([<<"a//b/c/">>, <<"d//e/f/g">>]),
+    <<"a/b/c/d/e/f/g">> = filename:join([<<"a//b/c">>, <<"d//e/f/g">>]),
+    <<"/d/e/f/g">> = filename:join([<<"a//b/c">>, <<"/d//e/f/g">>]),
+    <<"/d/e/f/g">> = filename:join([<<"a//b/c">>, <<"//d//e/f/g">>]),
 
-    ?line <<"foo/bar">> = filename:join([$f,$o,$o,$/,[]], <<"bar">>),
+    <<"foo/bar">> = filename:join([$f,$o,$o,$/,[]], <<"bar">>),
 
     %% Single dots - should be removed if in the middle of the path,
     %% but not at the end of the path.
@@ -699,30 +687,25 @@ join_bin(Config) when is_list(Config) ->
     <<"/a/b">> = filename:join([<<"/a/">>,<<"b/">>]),
     <<"/a/b">> = filename:join(<<"/a/">>,<<"b/">>),
 
-    ?line case os:type() of
-	      {win32, _} ->
-		  ?line <<"d:/">> = filename:join([<<"D:/">>]),
-		  ?line <<"d:/">> = filename:join([<<"D:\\">>]),
-		  ?line <<"d:/abc">> = filename:join([<<"D:/">>, <<"abc">>]),
-		  ?line <<"d:abc">> = filename:join([<<"D:">>, <<"abc">>]),
-		  ?line <<"a/b/c/d/e/f/g">> =
-		      filename:join([<<"a//b\\c//\\/\\d/\\e/f\\g">>]),
-		  ?line <<"a:usr/foo.erl">> =
-		      filename:join([<<"A:">>,<<"usr">>,<<"foo.erl">>]),
-		  ?line <<"/usr/foo.erl">> =
-		      filename:join([<<"A:">>,<<"/usr">>,<<"foo.erl">>]),
-		  ?line <<"c:usr">> = filename:join(<<"A:">>,<<"C:usr">>),
-		  ?line <<"a:usr">> = filename:join(<<"A:">>,<<"usr">>),
-		  ?line <<"c:/usr">> = filename:join(<<"A:">>, <<"C:/usr">>),
-		  ?line <<"c:/usr/foo.erl">> =
-		      filename:join([<<"A:">>,<<"C:/usr">>,<<"foo.erl">>]),
-		  ?line <<"c:usr/foo.erl">> =
-		      filename:join([<<"A:">>,<<"C:usr">>,<<"foo.erl">>]),
-		  ?line <<"d:/foo">> = filename:join([$D, $:, $/, []], <<"foo">>),
-		  ok;
-	      _ ->
-		  ok
-	  end.
+    case os:type() of
+        {win32, _} ->
+            <<"d:/">> = filename:join([<<"D:/">>]),
+            <<"d:/">> = filename:join([<<"D:\\">>]),
+            <<"d:/abc">> = filename:join([<<"D:/">>, <<"abc">>]),
+            <<"d:abc">> = filename:join([<<"D:">>, <<"abc">>]),
+            <<"a/b/c/d/e/f/g">> = filename:join([<<"a//b\\c//\\/\\d/\\e/f\\g">>]),
+            <<"a:usr/foo.erl">> = filename:join([<<"A:">>,<<"usr">>,<<"foo.erl">>]),
+            <<"/usr/foo.erl">> = filename:join([<<"A:">>,<<"/usr">>,<<"foo.erl">>]),
+            <<"c:usr">> = filename:join(<<"A:">>,<<"C:usr">>),
+            <<"a:usr">> = filename:join(<<"A:">>,<<"usr">>),
+            <<"c:/usr">> = filename:join(<<"A:">>, <<"C:/usr">>),
+            <<"c:/usr/foo.erl">> = filename:join([<<"A:">>,<<"C:/usr">>,<<"foo.erl">>]),
+            <<"c:usr/foo.erl">> = filename:join([<<"A:">>,<<"C:usr">>,<<"foo.erl">>]),
+            <<"d:/foo">> = filename:join([$D, $:, $/, []], <<"foo">>),
+            ok;
+        _ ->
+            ok
+    end.
 
 pathtype_bin(Config) when is_list(Config) ->
     relative = filename:pathtype(<<"..">>),
@@ -730,14 +713,14 @@ pathtype_bin(Config) when is_list(Config) ->
     relative = filename:pathtype(<<"foo/bar">>),
     relative = filename:pathtype('foo/bar'),
     case os:type() of
-	{win32, _} ->
-	    volumerelative = filename:pathtype(<<"/usr/local/bin">>),
-	    volumerelative = filename:pathtype(<<"A:usr/local/bin">>),
-	    ok;
-	_ ->
-	    absolute = filename:pathtype(<<"/">>),
-	    absolute = filename:pathtype(<<"/usr/local/bin">>),
-	    ok
+        {win32, _} ->
+            volumerelative = filename:pathtype(<<"/usr/local/bin">>),
+            volumerelative = filename:pathtype(<<"A:usr/local/bin">>),
+            ok;
+        _ ->
+            absolute = filename:pathtype(<<"/">>),
+            absolute = filename:pathtype(<<"/usr/local/bin">>),
+            ok
     end.
 
 rootname_bin(Config) when is_list(Config) ->
@@ -756,29 +739,29 @@ split_bin(Config) when is_list(Config) ->
     [<<"/">>] = filename:split(<<"/">>),
     [] = filename:split(<<"">>),
     case os:type() of
-       {win32,_} ->
-	    [<<"a:/">>,<<"msdev">>,<<"include">>] =
-		filename:split(<<"a:/msdev/include">>),
-	    [<<"a:/">>,<<"msdev">>,<<"include">>] =
-		filename:split(<<"A:/msdev/include">>),
-	    [<<"msdev">>,<<"include">>] =
-		filename:split(<<"msdev\\include">>),
-	    [<<"a:/">>,<<"msdev">>,<<"include">>] =
-		filename:split(<<"a:\\msdev\\include">>),
-	    [<<"a:">>,<<"msdev">>,<<"include">>] =
-		filename:split(<<"a:msdev\\include">>),
-	    ok;
-       _ ->
-	    ok
+        {win32,_} ->
+            [<<"a:/">>,<<"msdev">>,<<"include">>] =
+                filename:split(<<"a:/msdev/include">>),
+            [<<"a:/">>,<<"msdev">>,<<"include">>] =
+                filename:split(<<"A:/msdev/include">>),
+            [<<"msdev">>,<<"include">>] =
+                filename:split(<<"msdev\\include">>),
+            [<<"a:/">>,<<"msdev">>,<<"include">>] =
+                filename:split(<<"a:\\msdev\\include">>),
+            [<<"a:">>,<<"msdev">>,<<"include">>] =
+                filename:split(<<"a:msdev\\include">>),
+            ok;
+        _ ->
+            ok
     end.
 
 t_nativename_bin(Config) when is_list(Config) ->
-    ?line <<"abcedf">> = filename:nativename(<<"abcedf">>),
+    <<"abcedf">> = filename:nativename(<<"abcedf">>),
     case os:type() of
-	{win32, _} ->
-	    ?line <<"a:\\temp\\arne.exe">> =
-		filename:nativename(<<"A:/temp//arne.exe/">>);
-	_ ->
-	    ?line <<"/usr/tmp/arne">> =
-		filename:nativename(<<"/usr/tmp//arne/">>)
+        {win32, _} ->
+            <<"a:\\temp\\arne.exe">> =
+                filename:nativename(<<"A:/temp//arne.exe/">>);
+        _ ->
+            <<"/usr/tmp/arne">> =
+                filename:nativename(<<"/usr/tmp//arne/">>)
     end.