core: loopback - simplify check_loopback()

[elogind.git] / src / test / test-cap-list.c

diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c
index 238f876f2a1fb5b7ca870abac5ac83c80fd3e77d..4e7513649821df17cfdc12f9a8d20ac0c3e5831f 100644 (file)
--- a/src/test/test-cap-list.c
+++ b/src/test/test-cap-list.c
@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "util.h"
 #include "log.h"
 #include "cap-list.h"
 #include "capability.h"
@@ -27,9 +28,9 @@ int main(int argc, char *argv[]) {
         int i;
 
         assert_se(!capability_to_name(-1));
-        assert_se(!capability_to_name(cap_last_cap()+1));
+        assert_se(!capability_to_name(capability_list_length()));
 
-        for (i = 0; i <= (int) cap_last_cap(); i++) {
+        for (i = 0; i < capability_list_length(); i++) {
                 const char *n;
 
                 assert_se(n = capability_to_name(i));
@@ -45,15 +46,15 @@ int main(int argc, char *argv[]) {
         assert_se(capability_from_name("15") == 15);
         assert_se(capability_from_name("-1") == -EINVAL);
 
-        for (i = 0; i <= (int) cap_last_cap(); i++) {
+        for (i = 0; i < capability_list_length(); i++) {
                 _cleanup_cap_free_charp_ char *a = NULL;
                 const char *b;
                 unsigned u;
 
                 assert_se(a = cap_to_name(i));
 
-                /* quite the loop as soon as libcap only returns
-                 * numeric ids, formatted as string */
+                /* quit the loop as soon as libcap starts returning
+                 * numeric ids, formatted as strings */
                 if (safe_atou(a, &u) >= 0)
                         break;
 
@@ -61,7 +62,7 @@ int main(int argc, char *argv[]) {
 
                 printf("%s vs. %s\n", a, b);
 
-                assert_se(streq(a, b));
+                assert_se(strcasecmp(a, b) == 0);
         }
 
         return 0;