From 10575a5d528aaa10434f3ce12eea0ca28298a204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Kadl=C4=8D=C3=ADk?= <vkadlcik@redhat.com>
Date: Wed, 16 Feb 2022 13:37:38 +0100
Subject: [PATCH] Fix RHBZ#1311352 test for newer Fedora versions

The test used nscd which has been obsoleted by Fedora [1].  Fortunately
that package was just an example, any package using the same debuginfo
layout will do. Let's use coreutils instead.

[1] https://fedoraproject.org/wiki/Changes/RemoveNSCD
---
 .../main.fmf                                           |  2 +-
 .../runtest.sh                                         | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow/main.fmf b/tests/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow/main.fmf
index 6be3d1c..db83711 100644
--- a/tests/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow/main.fmf
+++ b/tests/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow/main.fmf
@@ -10,7 +10,7 @@ framework: beakerlib
 recommend:
 - binutils
 - strace
-- nscd
+- coreutils
 duration: 15m
 extra-summary: /tools/binutils/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow
 extra-task: /tools/binutils/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow
diff --git a/tests/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow/runtest.sh b/tests/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow/runtest.sh
index e9e58a6..fb20d7d 100755
--- a/tests/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow/runtest.sh
+++ b/tests/Regression/bz1311352-objdump-S-disassembly-code-doesn-t-follow/runtest.sh
@@ -54,7 +54,7 @@ rlJournalStart
 
         rlLogInfo "(without skipped) COLLECTIONS=$COLLECTIONS"
 
-        for i in glibc nscd; do
+        for i in glibc coreutils; do
             rpm -q ${i}-debuginfo.${ARCH} &>/dev/null || rlRun "debuginfo-install -y ${i}.${ARCH}"
         done
 
@@ -67,12 +67,12 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStartTest
-        rlRun "strace -e trace=open,openat -o strace.out $OBJDUMP -drS /usr/sbin/nscd &> out"
+        rlRun "strace -e trace=open,openat -o strace.out $OBJDUMP -drS /usr/bin/ls &> out"
         rlRun "grep '/usr/lib/debug' strace.out"
 
-        # Check whether objdump output contains source code snippets
-        # NSCD sources can change in time, but I'm quite sure there'll
-        # always be at least one "int i;"
+        # Check whether objdump output contains source code snippets.
+        # ls sources can change in time, but it's likely there always
+        # will be at least one "int i;".
         rlRun "grep 'int i' out > /dev/null" 0 "Checking for source code snippets in objdump output"
 
         rlLogInfo "$(head -n20 out)"