diff options
author | Dan Gudmundsson <[email protected]> | 2016-03-31 15:34:37 +0200 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2016-04-22 09:25:04 +0200 |
commit | 6d1f0b6ac13e2a8615a1d92238892196daa4ee4e (patch) | |
tree | ef50df50623c868b9dda9e0816bd4275c3bbdcfb /lib | |
parent | 8e0cf992413ed5f5a71621f7f70213985ff12578 (diff) | |
download | otp-6d1f0b6ac13e2a8615a1d92238892196daa4ee4e.tar.gz otp-6d1f0b6ac13e2a8615a1d92238892196daa4ee4e.tar.bz2 otp-6d1f0b6ac13e2a8615a1d92238892196daa4ee4e.zip |
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.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/sasl/test/release_handler_SUITE.erl | 17 |
1 files changed, 11 insertions, 6 deletions
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 |