Jacek Caban : services: Skip tests if OpenSCManager failed.

Alexandre Julliard julliard at winehq.org
Tue Apr 8 14:02:51 CDT 2014


Module: wine
Branch: master
Commit: 98e9e4a3b0fcc0ca526f286dbe680f4311f836e3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=98e9e4a3b0fcc0ca526f286dbe680f4311f836e3

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Apr  8 11:20:27 2014 +0200

services: Skip tests if OpenSCManager failed.

This should also fix failures on VMs with insufficient privileges.

---

 programs/services/tests/service.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c
index 8511b92..203882d 100644
--- a/programs/services/tests/service.c
+++ b/programs/services/tests/service.c
@@ -471,10 +471,14 @@ START_TEST(service)
         return;
     }
 
-    argc = winetest_get_mainargs(&argv);
-
     scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL);
-    ok(scm_handle != NULL, "OpenSCManager failed: %u\n", GetLastError());
+    ok(scm_handle != NULL || GetLastError() == ERROR_ACCESS_DENIED, "OpenSCManager failed: %u\n", GetLastError());
+    if(!scm_handle) {
+        skip("OpenSCManager failed, skipping tests\n");
+        return;
+    }
+
+    argc = winetest_get_mainargs(&argv);
 
     if(argc < 3) {
         test_runner(test_service);




More information about the wine-cvs mailing list