From d9068c729ea11c0d5bd84139c97f2fa952bf1d0b Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 5 Dec 2024 07:18:26 -0500
Subject: [PATCH] Reduce repetition in conditional skips

---
 rust-coreutils.spec | 53 +++------------------------------------------
 1 file changed, 3 insertions(+), 50 deletions(-)

diff --git a/rust-coreutils.spec b/rust-coreutils.spec
index b7df480..28f4755 100644
--- a/rust-coreutils.spec
+++ b/rust-coreutils.spec
@@ -223,6 +223,7 @@ cp -p data/completions/zsh/* %{buildroot}%{zsh_completions_dir}/
 # * test_sort: formatting differences with recent unicode-width versions
 %ifarch s390x
 # * test_od::test_suppress_duplicates: likely endianness issue
+%endif
 %{cargo_test -- -- %{shrink:
     --skip common::util::tests::test_compare_xattrs
     --skip test_chcon::
@@ -264,64 +265,16 @@ cp -p data/completions/zsh/* %{buildroot}%{zsh_completions_dir}/
     --skip test_seq::test_width_floats
     --skip test_seq::test_width_negative_zero_decimal_notation
     --skip test_seq::test_width_negative_zero_scientific_notation
+%ifarch s390x
     --skip test_od::test_suppress_duplicates
+%endif
     --skip test_sort::test_keys_closed_range
     --skip test_sort::test_keys_multiple_ranges
     --skip test_sort::test_keys_no_field_match
     --skip test_sort::test_keys_open_ended
 }}
-
-%else
-%{cargo_test -- -- %{shrink:
-    --skip common::util::tests::test_compare_xattrs
-    --skip test_chcon::
-    --skip test_runcon::
-    --skip test_cp::test_copy_dir_preserve_permissions
-    --skip test_cp::test_copy_dir_preserve_permissions_inaccessible_file
-    --skip test_cp::test_copy_through_dangling_symlink_no_dereference_permissions
-    --skip test_cp::test_cp_debug_reflink_auto_sparse_always_non_sparse_file_with_long_zero_sequence
-    --skip test_cp::test_cp_parents_2_dirs
-    --skip test_cp::test_cp_parents_with_permissions_copy_dir
-    --skip test_cp::test_cp_parents_with_permissions_copy_file
-    --skip test_cp::test_cp_preserve_xattr
-    --skip test_cp::test_cp_sparse_always_empty
-    --skip test_cp::test_cp_sparse_always_non_empty
-    --skip test_cp::test_preserve_hardlink_attributes_in_directory
-    --skip test_cp::test_preserve_mode
-    --skip test_df::test_file_column_width_if_filename_contains_unicode_chars
-    --skip test_df::test_nonexistent_file
-    --skip test_df::test_output_file_specific_files
-    --skip test_df::test_output_mp_repeat
-    --skip test_df::test_output_option_without_equals_sign
-    --skip test_df::test_total_label_in_correct_column
-    --skip test_df::test_type_option_with_file
-    --skip test_du::test_du_dereference_args
-    --skip test_du::test_du_no_dereference
-    --skip test_ls::test_device_number
-    --skip test_ls::test_ls_allocation_size
-    --skip test_ls::test_ls_inode
-    --skip test_ls::test_ls_long_format
-    --skip test_ls::test_ls_long_formats
-    --skip test_seq::test_count_down_floats
-    --skip test_seq::test_float_precision_increment
-    --skip test_seq::test_inf_width
-    --skip test_seq::test_neg_inf_width
-    --skip test_seq::test_separator_and_terminator_floats
-    --skip test_seq::test_width_decimal_scientific_notation_increment
-    --skip test_seq::test_width_decimal_scientific_notation_trailing_zeros_end
-    --skip test_seq::test_width_decimal_scientific_notation_trailing_zeros_increment
-    --skip test_seq::test_width_floats
-    --skip test_seq::test_width_negative_zero_decimal_notation
-    --skip test_seq::test_width_negative_zero_scientific_notation
-    --skip test_sort::test_keys_closed_range
-    --skip test_sort::test_keys_multiple_ranges
-    --skip test_sort::test_keys_no_field_match
-    --skip test_sort::test_keys_open_ended
-}}
-# non-s390x
 %endif
 # check
-%endif
 
 %changelog
 %autochangelog