From 24c5d6c4d6fee8f1fca6d02a014dd7338303a501 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 13 Dec 2024 13:52:39 +0000
Subject: [PATCH] gnu: go-github-com-containerd-cgroups: Fix build.

* gnu/packages/golang-xyz.scm (go-github-com-containerd-cgroups)
[arguments]<test-flags>: Move tests skip logic here and skip more tests.
<phases>: Remove 'disable-failing-tests.
[propagated-inputs]: Add go-github-com-cilium-ebpf.

Change-Id: I3ee11a4c21ea3750e3e886155530439f2e363811
---
 gnu/packages/golang-xyz.scm | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 2e3f061699b7a7077d1a9f2a9a2e98c96095e9fb..a342221a2b77b7b287b59ff4ec361f03c44f3241 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -2151,20 +2151,36 @@ dependencies and is intended to be used in long running processes.")
     (arguments
      (list
       #:import-path "github.com/containerd/cgroups"
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'disable-failing-tests
-            (lambda* (#:key tests? import-path #:allow-other-keys)
-              (with-directory-excursion (string-append "src/" import-path)
-                (substitute* (find-files "." "_test\\.go$")
-                  ;; expected error "controller is not supported" but received
-                  ;; "cgroups: cannot find cgroup mount destination"
-                  (("TestSystemd240") "OffTestSystemd240"))))))))
+      #:test-flags
+      #~(list "-skip" (string-join
+                       ;; cannot find cgroup mount destination"
+                       (list "TestSystemd240"
+                             ;; cannot statfs cgroup root
+                             "TestCgroupType"
+                             "TestCgroupv2CpuStats"
+                             "TestCgroupv2MemoryStats"
+                             "TestCgroupv2PSIStats"
+                             "TestCgroupv2PidsStats"
+                             "TestErrorsWhenUnitAlreadyExists"
+                             "TestEventChanCleanupOnCgroupRemoval"
+                             "TestIgnoreUnitExistsWhenPidNegativeOne"
+                             "TestKill"
+                             "TestMoveTo"
+                             "TestSystemdCgroupCpuController"
+                             "TestSystemdCgroupMemoryController"
+                             "TestSystemdCgroupPSIController"
+                             "TestSystemdCgroupPidsController"
+                             ;; Assertion failed
+                             "TestDeviceFilter_Nil"
+                             "TestDeviceFilter_Privileged"
+                             "TestDeviceFilter_Weird")
+                       "|"))))
     (native-inputs
      (list go-github-com-stretchr-testify
            go-go-uber-org-goleak))
     (propagated-inputs
-     (list go-github-com-coreos-go-systemd-v22
+     (list go-github-com-cilium-ebpf
+           go-github-com-coreos-go-systemd-v22
            go-github-com-docker-go-units
            go-github-com-godbus-dbus-v5
            go-github-com-gogo-protobuf