From 8b86cd551352ac06bccbeab4c76849d3978876ec Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Tue, 15 Feb 2011 19:58:13 +0100
Subject: Update TEST_SERVER_FRAMEWORK os variable to be regarded as undet if
 set to undefined

---
 lib/test_server/src/test_server.erl      | 2 +-
 lib/test_server/src/test_server_ctrl.erl | 8 ++++----
 lib/test_server/src/test_server_node.erl | 2 +-
 lib/test_server/src/test_server_sup.erl  | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index ee121e5bb6..0176b68579 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -856,7 +856,7 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate, Comment, CurrConf) ->
 	    %% a framework function failed
 	    CB = os:getenv("TEST_SERVER_FRAMEWORK"),
 	    Loc = case CB of
-		      false ->
+		      FW when FW =:= false; FW =:= "undefined" ->
 			  {test_server,Func};
 		      _ ->
 			  {list_to_atom(CB),Func}
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index 00278c0165..0c363085f4 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -643,7 +643,7 @@ contact_main_target(local) ->
     %% When used by a general framework, global registration of
     %% test_server should not be required.
     case os:getenv("TEST_SERVER_FRAMEWORK") of
-	false ->
+	FW when FW =:= false; FW =:= "undefined" ->
 	    %% Local target! The global test_server process implemented by
 	    %% test_server.erl will not be started, so we simulate it by
 	    %% globally registering this process instead.
@@ -1710,7 +1710,7 @@ do_test_cases(TopCases, SkipCases,
 		  [erlang:system_info(version), code:root_dir()]),
 
 	    case os:getenv("TEST_SERVER_FRAMEWORK") of
-		false ->
+		FW when FW =:= false; FW =:= "undefined" ->
 		    print(html, "<p>Target:<br>\n"),
 		    print_who(TI#target_info.host, TI#target_info.username),
 		    print(html, "<br>Used Erlang ~s in <tt>~s</tt>.\n",
@@ -4063,7 +4063,7 @@ get_font_style1(default) ->
 
 format_exception(Reason={_Error,Stack}) when is_list(Stack) ->
     case os:getenv("TEST_SERVER_FRAMEWORK") of
-	false ->
+	FW when FW =:= false; FW =:= "undefined" ->
 	    case application:get_env(test_server, format_exception) of
 		{ok,false} ->
 		    {"~p",Reason};
@@ -4636,7 +4636,7 @@ collect_case([Case | Cases], St, Acc) ->
 
 collect_case_invoke(Mod, Case, MFA, St) ->
     case os:getenv("TEST_SERVER_FRAMEWORK") of
-	false ->
+	FW when FW =:= false; FW =:= "undefined" ->
 	    case catch apply(Mod, Case, [suite]) of
 		{'EXIT',_} ->
 		    {ok,[MFA],St};
diff --git a/lib/test_server/src/test_server_node.erl b/lib/test_server/src/test_server_node.erl
index 49025b1a3d..056d18da96 100644
--- a/lib/test_server/src/test_server_node.erl
+++ b/lib/test_server/src/test_server_node.erl
@@ -84,7 +84,7 @@ start_remote_main_target(Parameters) ->
 					 MasterNode,MasterCookie),
     Cmd = 
 	case os:getenv("TEST_SERVER_FRAMEWORK") of
-	    false -> Cmd0;
+	    FW when FW =:= false; FW =:= "undefined" -> Cmd0;
 	    FW -> Cmd0 ++ " -env TEST_SERVER_FRAMEWORK " ++ FW
 	end,
 	
diff --git a/lib/test_server/src/test_server_sup.erl b/lib/test_server/src/test_server_sup.erl
index 625724fbb5..4a7804a482 100644
--- a/lib/test_server/src/test_server_sup.erl
+++ b/lib/test_server/src/test_server_sup.erl
@@ -494,7 +494,8 @@ framework_call(Func,Args) ->
 framework_call(Func,Args,DefaultReturn) ->
     CB = os:getenv("TEST_SERVER_FRAMEWORK"),
     framework_call(CB,Func,Args,DefaultReturn).
-framework_call(false,_Func,_Args,DefaultReturn) ->
+framework_call(FW,_Func,_Args,DefaultReturn)  
+  when FW =:= false; FW =:= "undefined" ->
     DefaultReturn;
 framework_call(Callback,Func,Args,DefaultReturn) ->
     Mod = list_to_atom(Callback),
-- 
cgit v1.2.3