The package rpms/rust-procfs.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-procfs.git/commit/?id=8ed91b14a....
Change: +%ifarch s390x
Thanks.
Full change: ============
commit 8ed91b14abfe074182c6c4176968b33f9dfc58bc Author: Benjamin A. Beasley code@musicinmybrain.net Date: Sun Dec 22 13:49:12 2024 -0500
Fix arch-conditional test skipping
diff --git a/procfs-fix-metadata.diff b/procfs-fix-metadata.diff index b195838..c6cd83d 100644 --- a/procfs-fix-metadata.diff +++ b/procfs-fix-metadata.diff @@ -1,5 +1,5 @@ --- procfs-0.17.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ procfs-0.17.0/Cargo.toml 2024-12-21T13:46:52.470824+00:00 ++++ procfs-0.17.0/Cargo.toml 2024-12-22T18:48:10.279335+00:00 @@ -164,17 +164,11 @@ features = ["derive"] optional = true diff --git a/rust-procfs.spec b/rust-procfs.spec index d2ce405..f5d15d0 100644 --- a/rust-procfs.spec +++ b/rust-procfs.spec @@ -135,26 +135,26 @@ use the "serde1" feature of the "%{crate}" crate. %check # * Some tests must be run serially: # https://github.com/eminence/procfs/issues/322 +skip="${skip-} --skip _runsinglethread" # * thread 'sys::kernel::random::tests::test_write_wakeup_threshold' panicked at # src/sys/kernel/random.rs:94:24: test_write_wakeup_threshold error: Io(Os { # code: 30, kind: ReadOnlyFilesystem, message: "Read-only file system" }, # Some("/proc/sys/kernel/random/write_wakeup_threshold")). This fails in a git # checkout if it is running in a mock chroot. +skip="${skip-} --skip sys::kernel::random::tests::test_write_wakeup_threshold" +%ifnarch x86_64 %{ix86} # * On non-x86 architectures, test_cpuinfo fails: # https://github.com/eminence/procfs/issues/323 -# * On s390x, test_kernel_stat and test_meminfo fail: -# https://github.com/eminence/procfs/issues/324 -%{cargo_test -- -- %{shrink: - --skip _runsinglethread - --skip sys::kernel::random::tests::test_write_wakeup_threshold -%ifnarch x86_64 %{ix86} - --skip tests::test_cpuinfo +skip="${skip-} --skip tests::test_cpuinfo" %endif %ifarch s390x - --skip tests::test_kernel_stat - --skip tests::test_meminfo +# * On s390x, test_kernel_stat and test_meminfo fail: +# https://github.com/eminence/procfs/issues/324 +skip="${skip-} --skip tests::test_kernel_stat" +skip="${skip-} --skip tests::test_meminfo" %endif -}} + +%{cargo_test -- -- ${skip-}} # Run the tests that must be run serially: %{cargo_test -- -- _runsinglethread --test-threads 1} %endif diff --git a/rust2rpm.toml b/rust2rpm.toml index cc699c0..514f560 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -21,41 +21,31 @@ comments = [ ]
[scripts.check] +pre = [ + """ +# * Some tests must be run serially: +# https://github.com/eminence/procfs/issues/322 +skip="${skip-} --skip _runsinglethread" +# * thread 'sys::kernel::random::tests::test_write_wakeup_threshold' panicked at +# src/sys/kernel/random.rs:94:24: test_write_wakeup_threshold error: Io(Os { +# code: 30, kind: ReadOnlyFilesystem, message: "Read-only file system" }, +# Some("/proc/sys/kernel/random/write_wakeup_threshold")). This fails in a git +# checkout if it is running in a mock chroot. +skip="${skip-} --skip sys::kernel::random::tests::test_write_wakeup_threshold" +%ifnarch x86_64 %{ix86} +# * On non-x86 architectures, test_cpuinfo fails: +# https://github.com/eminence/procfs/issues/323 +skip="${skip-} --skip tests::test_cpuinfo" +%endif +%ifarch s390x +# * On s390x, test_kernel_stat and test_meminfo fail: +# https://github.com/eminence/procfs/issues/324 +skip="${skip-} --skip tests::test_kernel_stat" +skip="${skip-} --skip tests::test_meminfo" +%endif +""", +] post = [ "# Run the tests that must be run serially:", "%{cargo_test -- -- _runsinglethread --test-threads 1}", ] - -[tests] -comments = [ - """\ - Some tests must be run serially: \ - https://github.com/eminence/procfs/issues/322%5C - """, - """\ - thread 'sys::kernel::random::tests::test_write_wakeup_threshold' panicked \ - at src/sys/kernel/random.rs:94:24: test_write_wakeup_threshold error: Io(Os \ - { code: 30, kind: ReadOnlyFilesystem, message: "Read-only file system" }, \ - Some("/proc/sys/kernel/random/write_wakeup_threshold")). This fails in a \ - git checkout if it is running in a mock chroot.\ - """, - """\ - On non-x86 architectures, test_cpuinfo fails: \ - https://github.com/eminence/procfs/issues/323%5C - """, - """\ - On s390x, test_kernel_stat and test_meminfo fail: \ - https://github.com/eminence/procfs/issues/324%5C - """, -] -skip = [ - "_runsinglethread", - "sys::kernel::random::tests::test_write_wakeup_threshold", - # %ifnarch x86_64 %{ix86} - "tests::test_cpuinfo", - # %endif - # %ifarch s390x - "tests::test_kernel_stat", - "tests::test_meminfo", - # %endif -]
arch-excludes@lists.fedoraproject.org