From 6d1f0b6ac13e2a8615a1d92238892196daa4ee4e Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Thu, 31 Mar 2016 15:34:37 +0200
Subject: Windows: Skip tests that requires admin privileges

Windows 8 and later have stronger admin checks which requires
erlang to run in privileged shells, ignore for now.
---
 erts/test/nt_SUITE.erl                  | 26 ++++++++++++++------------
 lib/sasl/test/release_handler_SUITE.erl | 17 +++++++++++------
 2 files changed, 25 insertions(+), 18 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.
 
 
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index ee620dcdb4..4dcaec03a7 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -54,7 +54,7 @@ unix_cases() ->
 	    end,
     [target_system, target_system_unicode] ++ RunErlCases ++ cases().
 
-win32_cases() -> 
+win32_cases() ->
     [{group,release} | cases()].
 
 %% Cases that can be run on all platforms
@@ -89,11 +89,16 @@ groups() ->
 %% {group,release}
 %% Top group for all cases using run_erl
 init_per_group(release, Config) ->
-    Dog = ?t:timetrap(?default_timeout),
-    P1gInstall = filename:join(priv_dir(Config),p1g_install),
-    ok = create_p1g(Config,P1gInstall),
-    ok = create_p1h(Config),
-    ?t:timetrap_cancel(Dog);
+    case {os:type(), os:version()} of
+	{{win32, nt}, Vsn} when Vsn > {6,1,999999} ->
+	    {skip, "Requires admin privileges on Win 8 and later"};
+	_ ->
+	    Dog = ?t:timetrap(?default_timeout),
+	    P1gInstall = filename:join(priv_dir(Config),p1g_install),
+	    ok = create_p1g(Config,P1gInstall),
+	    ok = create_p1h(Config),
+	    ?t:timetrap_cancel(Dog)
+    end;
 
 %% {group,release_single}
 %% Subgroup of {group,release}, contains all cases that are not
-- 
cgit v1.2.3