aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2016-04-22 09:28:01 +0200
committerDan Gudmundsson <[email protected]>2016-04-22 09:28:01 +0200
commit2b0ecf4f702f720ea0861f94a833bd11b22c34d5 (patch)
treeef50df50623c868b9dda9e0816bd4275c3bbdcfb /erts
parent9b099a4b7a7a095aec04fe7fa02d97aa005c9323 (diff)
parent6d1f0b6ac13e2a8615a1d92238892196daa4ee4e (diff)
downloadotp-2b0ecf4f702f720ea0861f94a833bd11b22c34d5.tar.gz
otp-2b0ecf4f702f720ea0861f94a833bd11b22c34d5.tar.bz2
otp-2b0ecf4f702f720ea0861f94a833bd11b22c34d5.zip
Merge branch 'dgud/test-cuddle'
* dgud/test-cuddle: Windows: Skip tests that requires admin privileges observer: add debug info to ttb_SUITE mnesia: add debug printouts
Diffstat (limited to 'erts')
-rw-r--r--erts/test/nt_SUITE.erl26
1 files changed, 14 insertions, 12 deletions
diff --git a/erts/test/nt_SUITE.erl b/erts/test/nt_SUITE.erl
index f798a40a6c..624e5484ba 100644
--- a/erts/test/nt_SUITE.erl
+++ b/erts/test/nt_SUITE.erl
@@ -37,13 +37,13 @@ suite() ->
[{ct_hooks,[ts_install_cth]},
{timetrap, {minutes, 3}}].
-all() ->
- case os:type() of
- {win32, nt} ->
- [nt, service_basic, service_env, user_env, synced,
- service_prio, logout, debug, restart, restart_always,
- stopaction];
- _ -> [nt]
+all() ->
+ case {os:type(), os:version()} of
+ {{win32, nt}, Vsn} when Vsn =< {6,1,999999} ->
+ [nt, service_basic, service_env, user_env, synced,
+ service_prio, logout, debug, restart, restart_always,
+ stopaction];
+ _ -> [nt]
end.
init_per_testcase(_Func, Config) ->
@@ -367,11 +367,13 @@ stopaction(Config) when is_list(Config) ->
%%% other platforms than NT.
nt(Config) when is_list(Config) ->
- case os:type() of
- {win32,nt} ->
- nt_run();
- _ ->
- {skipped, "This test case is intended for Win NT only."}
+ case {os:type(), os:version()} of
+ {{win32, nt}, Vsn} when Vsn =< {6,1,999999} ->
+ nt_run();
+ {{win32, nt}, _} ->
+ {skipped, "This test case requires admin privileges on Win 8 and later."};
+ _ ->
+ {skipped, "This test case is intended for Win NT only."}
end.