aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2010-10-01 17:27:49 +0200
committerLukas Larsson <[email protected]>2010-12-06 10:42:11 +0100
commit6a05b2c05f0e83ad9a98d8b3d09740f564d64f89 (patch)
tree855c8195477bc148a5c2c4bfc8cb151b93774871 /lib/test_server
parent7a6607d6326d93a92d701d0b505a48f32ed68d10 (diff)
downloadotp-6a05b2c05f0e83ad9a98d8b3d09740f564d64f89.tar.gz
otp-6a05b2c05f0e83ad9a98d8b3d09740f564d64f89.tar.bz2
otp-6a05b2c05f0e83ad9a98d8b3d09740f564d64f89.zip
Update so that when asking for os and we are in the test_server_ctrl process, just use os:type().
Diffstat (limited to 'lib/test_server')
-rw-r--r--lib/test_server/src/test_server_ctrl.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index 1dc5646184..2ab7b799fc 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -533,6 +533,8 @@ get_target_os_type() ->
undefined ->
%% This is probably called on the target node
os:type();
+ Pid when Pid =:= self() ->
+ os:type();
_pid ->
%% This is called on the controller, e.g. from a
%% specification clause of a test case