From c9b4775338a1b16ba60d6eb095bc4680c4368823 Mon Sep 17 00:00:00 2001
From: "psklenar@redhat.com" <psklenar@redhat.com>
Date: Mon, 20 Apr 2026 13:20:30 +0200
Subject: [PATCH] Add optional CLI tools installation and show package versions

Changes:
- Show full package version in crash reports (NAME-VERSION-RELEASE)
- Add optional installation of extra CLI tools (enabled by default)
- Install via dnf group install: Development Tools, C Development, System Tools
- Add 50+ CLI packages: compression, text tools, databases, debug tools
- Disable with: INSTALL_EXTRA_TOOLS=no
- Adds ~200-400 binaries to test coverage when enabled

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 system-in-use/run-them-all/main.fmf           |  3 ++
 system-in-use/run-them-all/runtest.sh         | 34 ++++++++++++++++++-
 .../try-all-binaries-help-options.sh          |  2 +-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/system-in-use/run-them-all/main.fmf b/system-in-use/run-them-all/main.fmf
index 4717245..b53cdc6 100644
--- a/system-in-use/run-them-all/main.fmf
+++ b/system-in-use/run-them-all/main.fmf
@@ -8,3 +8,6 @@ enabled: false
 adjust:
   - when: "force == yes"
     enabled: true
+
+# run.me: testing-farm-public request --test-type fmf --git-url https://forge.fedoraproject.org/quality/fmf-tests.git --git-ref main  --compose Fedora-Cloud-Base-AmazonEC2.x86_64-44-1.3 --arch x86_64  --test run-them-all --context "force=yes"
+# tmt -c force=yes try 3.140.248.134@connect --test '/system-in-use/run-them-all'
diff --git a/system-in-use/run-them-all/runtest.sh b/system-in-use/run-them-all/runtest.sh
index cdd696c..dd9af14 100755
--- a/system-in-use/run-them-all/runtest.sh
+++ b/system-in-use/run-them-all/runtest.sh
@@ -6,8 +6,40 @@
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 rlJournalStart
-    rlPhaseStartSetup
+    rlPhaseStartSetup "Install extra CLI tools"
         CORES_COUNT_OLD=$(coredumpctl list|wc -l)
+
+        # Install extra tools to increase binary coverage (default: enabled)
+        if [[ "${INSTALL_EXTRA_TOOLS:-yes}" == "yes" ]]; then
+            rlLog "Installing extra CLI tools via group install..."
+
+            # Install CLI-focused package groups
+            rlRun "dnf group install -y --skip-broken \
+                'Development Tools' \
+                'C Development Tools and Libraries' \
+                'System Tools'" 0-255
+
+            # Install additional CLI utilities
+            rlRun "dnf install -y --skip-broken \
+                bzip2 xz zstd lz4 zip unzip p7zip \
+                jq xmlstarlet yq \
+                sqlite mariadb postgresql-server \
+                ImageMagick sox \
+                strace ltrace gdb \
+                nmap-ncat socat netcat \
+                curl wget rsync aria2 \
+                vim-enhanced emacs-nox nano \
+                python3-pip ruby golang rust cargo \
+                pandoc markdown asciidoc \
+                htop iotop sysstat perf \
+                tree file pv progress \
+                sed awk gawk grep ripgrep \
+                tar cpio rsync rclone" 0-255
+
+            rlLog "Extra tools installation complete"
+        else
+            rlLog "Skipping extra tools installation (INSTALL_EXTRA_TOOLS=no)"
+        fi
     rlPhaseEnd
 
     rlPhaseStartTest "run"
diff --git a/system-in-use/run-them-all/try-all-binaries-help-options.sh b/system-in-use/run-them-all/try-all-binaries-help-options.sh
index b953611..ac88ae9 100755
--- a/system-in-use/run-them-all/try-all-binaries-help-options.sh
+++ b/system-in-use/run-them-all/try-all-binaries-help-options.sh
@@ -185,7 +185,7 @@ echo "===================="
 fuzz_binary() {
     local bin="$1"
     local name=$(basename "$bin")
-    local pkg=$(rpm -qf "$bin" --qf '%{NAME}' 2>/dev/null || echo "unknown")
+    local pkg=$(rpm -qf "$bin" --qf '%{NAME}-%{VERSION}-%{RELEASE}' 2>/dev/null || echo "unknown")
 
     # Extract flags from --help
     local flags=()