aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2011-04-07 17:10:21 +0200
committerLukas Larsson <[email protected]>2011-04-15 14:45:10 +0200
commit7ffe6f4faf3df263e662091c0a8de729418cbb31 (patch)
tree4fab03ae97b9e4d378df0dc041381c3c8e5cf589 /lib/test_server
parent8f33b229f303cbd360fd8c8262e26a5a47416710 (diff)
downloadotp-7ffe6f4faf3df263e662091c0a8de729418cbb31.tar.gz
otp-7ffe6f4faf3df263e662091c0a8de729418cbb31.tar.bz2
otp-7ffe6f4faf3df263e662091c0a8de729418cbb31.zip
Update framwork backwards compatability check to use TEST_SERVER_FRAMEWORK as it should and not the Module
Diffstat (limited to 'lib/test_server')
-rw-r--r--lib/test_server/src/test_server.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 4e6c65a532..8fe7d72270 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -1193,8 +1193,10 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
do_end_tc_call(M,F,Res,Return) ->
Ref = make_ref(),
- case ?pl2a(M) of
- ct_framework ->
+ case os:getenv("TEST_SERVER_FRAMEWORK") of
+ FW when FW == "ct_framework";
+ FW == "undefined";
+ FW == false ->
case test_server_sup:framework_call(
end_tc, [?pl2a(M),F,Res, Return], ok) of
{fail,FWReason} ->