Commit 9dee7915 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

cmd/tests: Use net session to verify we have sufficient privileges.

Modifying the associations requires holding administrator+elevated privileges. 'net session' is the standard way of checking that in batch files. Signed-off-by: 's avatarFrancois Gouget <fgouget@free.fr> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent a9513cf4
...@@ -1950,6 +1950,10 @@ if exist baz\lala (echo file created in read-only dir) else echo file not create ...@@ -1950,6 +1950,10 @@ if exist baz\lala (echo file created in read-only dir) else echo file not create
cd .. & rd /s/q foobar cd .. & rd /s/q foobar
echo ------------ Testing assoc ------------ echo ------------ Testing assoc ------------
rem Modifying associations requires some privileges...
net session >nul 2>&1
if errorlevel 1 goto :SkipAssoc
rem FIXME Can't test error messages in the current test system, so we have to use some kludges rem FIXME Can't test error messages in the current test system, so we have to use some kludges
rem FIXME Revise once || conditional execution is fixed rem FIXME Revise once || conditional execution is fixed
mkdir foobar & cd foobar mkdir foobar & cd foobar
...@@ -1978,8 +1982,25 @@ cmd /c tmp.cmd > baz ...@@ -1978,8 +1982,25 @@ cmd /c tmp.cmd > baz
type baz type baz
echo --- echo ---
cd .. & rd /s/q foobar cd .. & rd /s/q foobar
goto ContinueFType
:SkipAssoc
echo --- setting association
echo ---
echo .foo=bar
echo .foo=bar
echo +++
echo .foo=bar
echo --- resetting association
echo ---
echo +++
echo ---
:ContinueFType
echo ------------ Testing ftype ------------ echo ------------ Testing ftype ------------
rem Modifying associations requires some privileges...
net session >nul 2>&1
if errorlevel 1 goto :SkipFType
rem FIXME Can't test error messages in the current test system, so we have to use some kludges rem FIXME Can't test error messages in the current test system, so we have to use some kludges
rem FIXME Revise once || conditional execution is fixed rem FIXME Revise once || conditional execution is fixed
mkdir foobar & cd foobar mkdir foobar & cd foobar
...@@ -2020,7 +2041,19 @@ regedit /s regCleanup.reg ...@@ -2020,7 +2041,19 @@ regedit /s regCleanup.reg
set WINE_FOO= set WINE_FOO=
endlocal endlocal
cd .. & rd /s/q foobar cd .. & rd /s/q foobar
goto ContinueCall
:SkipFType
echo --- setting association
echo ---
echo footype=foo_opencmd
echo .foo=footype
echo footype=foo_opencmd
echo +++
echo footype=foo_opencmd
echo --- resetting association
echo original value
:ContinueCall
echo ------------ Testing CALL ------------ echo ------------ Testing CALL ------------
mkdir foobar & cd foobar mkdir foobar & cd foobar
echo --- external script echo --- external script
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment