]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Revert "test: skip tpm2 test on s390x on GHA"
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 25 May 2026 18:25:04 +0000 (03:25 +0900)
committerLuca Boccassi <luca.boccassi@gmail.com>
Mon, 25 May 2026 21:17:00 +0000 (22:17 +0100)
This reverts commit b735d01c8aa415f45fd562b245c673142cc8b4b4.

Closes #38229.

src/test/test-tpm2.c

index c9a2e0a9bb80bf6ef50a6eba341fa0ac49d583d7..6e95499a8ac10fc70bbaf2234597f1bc7acc3705 100644 (file)
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "architecture.h"
 #include "crypto-util.h"
 #include "hexdecoct.h"
 #include "tests.h"
@@ -877,13 +876,6 @@ static void check_tpm2b_public_from_rsa_pem(const char *pem, const char *hexn, u
 }
 
 TEST(tpm2b_public_from_openssl_pkey) {
-        // TODO: this test fails on s390x but only on Github Actions, re-enable once
-        // https://github.com/systemd/systemd/issues/38229 is fixed
-        if (strstr_ptr(ci_environment(), "github-actions") && uname_architecture() == ARCHITECTURE_S390X) {
-                log_notice("%s: skipping test on GH Actions because of systemd/systemd#38229", __func__);
-                return;
-        }
-
         /* standard ECC key */
         check_tpm2b_public_from_ecc_pem("2d2d2d2d2d424547494e205055424c4943204b45592d2d2d2d2d0a4d466b77457759484b6f5a497a6a3043415159494b6f5a497a6a30444151634451674145726a6e4575424c73496c3972687068777976584e50686a346a426e500a44586e794a304b395579724e6764365335413532542b6f5376746b436a365a726c34685847337741515558706f426c532b7448717452714c35513d3d0a2d2d2d2d2d454e44205055424c4943204b45592d2d2d2d2d0a",
                                         "ae39c4b812ec225f6b869870caf5cd3e18f88c19cf0d79f22742bd532acd81de",