Changeset dc5c303 in mainline for uspace/app/taskbar/test/wndlist.c

Timestamp:

2023-12-28T13:59:23Z (14 months ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• uspace/app/taskbar/test/wndlist.c (modified) (3 diffs)

uspace/app/taskbar/test/wndlist.c

@@ -139 +139 @@
         ui_fixed_t *fixed = NULL;
         wndlist_t *wndlist;
+        loc_srv_t *srv;
 
         /* Set up a test WM service */
@@ -145 +146 @@
 
         // FIXME This causes this test to be non-reentrant!
-        rc = loc_server_register(test_wndmgt_server);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = loc_service_register(test_wndmgt_svc, &sid);
+        rc = loc_server_register(test_wndmgt_server, &srv);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = loc_service_register(srv, test_wndmgt_svc, &sid);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -177 +178 @@
         ui_destroy(ui);
 
-        rc = loc_service_unregister(sid);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        rc = loc_service_unregister(srv, sid);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        loc_server_unregister(srv);
 }