From dcc12472127d4e2398fe875763c991abf34dbc16 Mon Sep 17 00:00:00 2001
From: Jesus Checa Hidalgo <jchecahi@redhat.com>
Date: Wed, 23 Feb 2022 11:49:37 +0100
Subject: [PATCH] tests: fixes for gating tests

* plans/ci: setting "how: beakerlib" in execute step is deprecated.
  changed to "how: tmt" to comply with newer tmt versions.
  tmt versions.
* ltrace with both --o and --c does not produce output to file:
  add malloc to the list of syscalls to check for tracing.
* ltrace crashes when run on certain processes with --S option:
  make pgrep to exact match to avoid getting two PIDs, one from
  dbus-broker and other from dbus-broker-launch.
* ltrace doesn't work on PIE-binaries:
  Added missing 32-bit dependencies.
---
 plans/ci.fmf                                        |  2 +-
 .../runtest.sh                                      | 13 ++++++++++---
 .../runtest.sh                                      |  2 +-
 .../main.fmf                                        |  2 ++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/plans/ci.fmf b/plans/ci.fmf
index 1ad2c12..85710d6 100644
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@@ -3,4 +3,4 @@ discover:
     how: fmf
     directory: tests
 execute:
-    how: beakerlib
+    how: tmt
diff --git a/tests/Regression/447404-ltrace-with-both--o-and--c-options-does-not-produce-output-to-file/runtest.sh b/tests/Regression/447404-ltrace-with-both--o-and--c-options-does-not-produce-output-to-file/runtest.sh
index 77fbfef..bb5c85a 100755
--- a/tests/Regression/447404-ltrace-with-both--o-and--c-options-does-not-produce-output-to-file/runtest.sh
+++ b/tests/Regression/447404-ltrace-with-both--o-and--c-options-does-not-produce-output-to-file/runtest.sh
@@ -67,15 +67,22 @@ rlJournalStart
         fi
 
         # ltrace no longer reports __libc_start_main on rhel-8 x86_64 (rhbz#1654734)
-        if grep "ioctl" ltrace-test-sys.log; then
+        # search for either malloc or ioctl.
+        func_found=0
+        for traced_func in "malloc" "ioctl"; do
+            if grep "$traced_func" ltrace-test-sys.log; then
+                func_found=1
+            fi
+        done
+        if [ $func_found -ne 0 ]; then
             if [ $skip_system_binary_test ]; then
                 rlLogWarning "Test was skipped but it seems ok. Review skip check."
             fi
         else
             if [ $skip_system_binary_test ]; then
-                rlLogInfo "ltrace output does not contain ioctl calls (expected failure)"
+                rlLogInfo "ltrace output does not contain ioctl or malloc calls (expected failure)"
             else
-                rlFail "ltrace output does not contain ioctl calls"
+                rlFail "ltrace output does not contain ioctl or malloc calls"
             fi
         fi
 
diff --git a/tests/Regression/bz1360259-ltrace-crashes-when-run-on-certain-processes-with-the--S-option/runtest.sh b/tests/Regression/bz1360259-ltrace-crashes-when-run-on-certain-processes-with-the--S-option/runtest.sh
index 1ae4c93..1434c47 100755
--- a/tests/Regression/bz1360259-ltrace-crashes-when-run-on-certain-processes-with-the--S-option/runtest.sh
+++ b/tests/Regression/bz1360259-ltrace-crashes-when-run-on-certain-processes-with-the--S-option/runtest.sh
@@ -46,7 +46,7 @@ fi
 rlJournalStart
     rlPhaseStartSetup
         rlAssertRpm $PACKAGE
-        rlRun "pgrep $PROC_NAME || service $SERVICE_NAME start" 0 "Checking/starting $SERVICE_NAME"
+        rlRun "pgrep -x $PROC_NAME || service $SERVICE_NAME start" 0 "Checking/starting $SERVICE_NAME"
         rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
         rlRun "pushd $TmpDir"
     rlPhaseEnd
diff --git a/tests/Regression/bz868281-ltrace-doesn-t-work-on-PIE-binaries/main.fmf b/tests/Regression/bz868281-ltrace-doesn-t-work-on-PIE-binaries/main.fmf
index f45f827..bcce809 100644
--- a/tests/Regression/bz868281-ltrace-doesn-t-work-on-PIE-binaries/main.fmf
+++ b/tests/Regression/bz868281-ltrace-doesn-t-work-on-PIE-binaries/main.fmf
@@ -12,6 +12,8 @@ recommend:
 - gcc
 - libgcc
 - glibc-devel
+- libgcc.i686
+- glibc-devel.i686
 duration: 5m
 link:
 -   relates: https://bugzilla.redhat.com/show_bug.cgi?id=868281