Merge pull request #15442 from poettering/fido2

[thirdparty/systemd.git] / src / test / test-architecture.c

diff --git a/src/test/test-architecture.c b/src/test/test-architecture.c
index 68975b790a24279938178a45fc592f6e924eac4a..8c43bfc750ec265e9a58d63ada0836e453732daf 100644 (file)
--- a/src/test/test-architecture.c
+++ b/src/test/test-architecture.c
@@ -1,33 +1,27 @@
-/***
-  This file is part of systemd.
-
-  Copyright 2014 Kay Sievers
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
+/* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include "architecture.h"
 #include "log.h"
+#include "tests.h"
 #include "util.h"
 #include "virt.h"
 
 int main(int argc, char *argv[]) {
         int a, v;
+        const char *p;
+
+        test_setup_logging(LOG_INFO);
+
+        assert_se(architecture_from_string("") < 0);
+        assert_se(architecture_from_string(NULL) < 0);
+        assert_se(architecture_from_string("hoge") < 0);
+        assert_se(architecture_to_string(-1) == NULL);
+        assert_se(architecture_from_string(architecture_to_string(0)) == 0);
+        assert_se(architecture_from_string(architecture_to_string(1)) == 1);
 
         v = detect_virtualization();
         if (IN_SET(v, -EPERM, -EACCES))
-                return EXIT_TEST_SKIP;
+                return log_tests_skipped("Cannot detect virtualization");
 
         assert_se(v >= 0);
 
@@ -39,12 +33,18 @@ int main(int argc, char *argv[]) {
         a = uname_architecture();
         assert_se(a >= 0);
 
-        log_info("uname architecture=%s", architecture_to_string(a));
+        p = architecture_to_string(a);
+        assert_se(p);
+        log_info("uname architecture=%s", p);
+        assert_se(architecture_from_string(p) == a);
 
         a = native_architecture();
         assert_se(a >= 0);
 
-        log_info("native architecture=%s", architecture_to_string(a));
+        p = architecture_to_string(a);
+        assert_se(p);
+        log_info("native architecture=%s", p);
+        assert_se(architecture_from_string(p) == a);
 
         log_info("primary library architecture=" LIB_ARCH_TUPLE);