From 09aecc201596c76a7d1fad7704b509a8a4ae07e6b8a489114c1d8d0ac53a80f9 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Mon, 26 Sep 2022 15:01:51 +0000
Subject: [PATCH] Accepting request 1005746 from
 home:eeich:branches:network:cluster

- Do not deduplicate files of testsuite Slurm configuration.
  This directory is supposed to be mounted over /etc/slurm
  therefore it must not contain softlinks to the files in
  this directory.
- Improve .a and .o file collection for test suite: find these
  files even if there are multiple ones in a single line.

OBS-URL: https://build.opensuse.org/request/show/1005746
OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=218
---
 slurm.changes | 10 ++++++++++
 slurm.spec    |  8 +++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/slurm.changes b/slurm.changes
index 8f3ab92..6ac8c58 100644
--- a/slurm.changes
+++ b/slurm.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Sep 24 07:34:31 UTC 2022 - Egbert Eich <eich@suse.com>
+
+- Do not deduplicate files of testsuite Slurm configuration.
+  This directory is supposed to be mounted over /etc/slurm
+  therefore it must not contain softlinks to the files in
+  this directory.
+- Improve .a and .o file collection for test suite: find these
+  files even if there are multiple ones in a single line.
+
 -------------------------------------------------------------------
 Tue Sep 20 21:12:19 UTC 2022 - Egbert Eich <eich@suse.com>
 
diff --git a/slurm.spec b/slurm.spec
index d4695a4..36af931 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -152,7 +152,7 @@ Source1:        slurm-rpmlintrc
 Source10:       https://raw.githubusercontent.com/openSUSE/hpc/10c105e/files/slurm/slurmd.xml
 Source11:       https://raw.githubusercontent.com/openSUSE/hpc/10c105e/files/slurm/slurmctld.xml
 Source12:       https://raw.githubusercontent.com/openSUSE/hpc/10c105e/files/slurm/slurmdbd.xml
-# create: tar --owner=nobody --group=nogroup -cvzf test_setup.tar.gz test_setup
+# create: tar --owner=nobody --group=nogroup --exclude=*~ -cvzf test_setup.tar.gz test_setup
 Source20:       test_setup.tar.gz
 Source21:       README_Testsuite.md
 Patch0:         Remove-rpath-from-build.patch
@@ -851,7 +851,7 @@ while true; do
     filelist="$(for i in $filelist $tlist; do echo $i; done | sort | uniq)"
     [ "$filelist" = "$oldfilelist" ] && break
 done
-filelist+=" $(grep -r "build_dir.*\.[oa]" | sed -e 's@.*[^ ]*{build_dir}/\([^\]*\.o\).*@\1@' | sort | uniq)"
+filelist+=" $(grep -Ehor '\{*build_dir\}*[^ ]*\.[oa]' | sed -e "s@{*build_dir}*/@@" | sort | uniq)"
 cd -
 newlist=""
 for i in $filelist; do
@@ -920,11 +920,13 @@ mkdir -p %{buildroot}/root
 mv test_setup/setup-testsuite.sh %{buildroot}/root
 
 mkdir -p %{buildroot}/srv/slurm-testsuite/config/plugstack.conf.d
-mv test_setup/* %{buildroot}/srv/slurm-testsuite/config
 cp %{S:21} .
 %endif
 
 %fdupes -s %{buildroot}
+# For testsuite - do after fdupes!
+[ -d test_setup -a -d %{buildroot}/srv/slurm-testsuite/config ] && \
+    mv test_setup/* %{buildroot}/srv/slurm-testsuite/config
 
 # Temporary - remove when build is fixed upstream.
 %if !0%{?build_slurmrestd}