From 06436d11ba96e85aae188ddce1ffa16b29ddcf22 Mon Sep 17 00:00:00 2001
From: Jesus Checa Hidalgo <jchecahi@redhat.com>
Date: Mon, 10 Jun 2024 11:44:30 +0200
Subject: [PATCH] Revert "use-correct-dwarf-default: Update test"

This reverts commit dade06cfdd09e14ebd04b8ffc61909228ec8fc9d.
---
 tests/use-correct-dwarf-default/main.fmf   |  4 ----
 tests/use-correct-dwarf-default/runtest.sh | 21 ++++++++++++++-------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/tests/use-correct-dwarf-default/main.fmf b/tests/use-correct-dwarf-default/main.fmf
index ed39bd9..3dcde07 100644
--- a/tests/use-correct-dwarf-default/main.fmf
+++ b/tests/use-correct-dwarf-default/main.fmf
@@ -25,7 +25,3 @@ adjust+:
       - llvm-toolset-15.0-clang
       - llvm-toolset-15.0-llvm
     when: "collection == llvm-toolset-15.0"
-
-  - environment+:
-      DWARF_VERSION: 4
-    when: distro < rhel-10 or distro < centos-stream-10
diff --git a/tests/use-correct-dwarf-default/runtest.sh b/tests/use-correct-dwarf-default/runtest.sh
index 926658e..9918462 100755
--- a/tests/use-correct-dwarf-default/runtest.sh
+++ b/tests/use-correct-dwarf-default/runtest.sh
@@ -1,16 +1,23 @@
 #!/bin/sh -eux
 
-# Determine correct DWARF version to use. Defaults to version 5, but older
-# distros might need to use version 4, which can be configured using the
-# DWARF_VERSION env var
-required_dwarf_version=${DWARF_VERSION:-5}
+# Determine correct DWARF version to use. If Clang is newer or equal to version
+# 18, we want to use DWARF5 except for Fedora 38 where we still want DWARF4.
+
+required_dwarf_version=4
 
 # Get clang version
 CLANG_PKG=$(rpm -qf --queryformat '%{name}' $(readlink -f $(type -p clang)))
 clang_version=$(rpm -q --queryformat "%{version}" $CLANG_PKG | grep -ioP "^[0-9]+")
-if  [ $clang_version -lt 18 ]; then
-    >&2 echo "clang is older than version 18";
-    required_dwarf_version=4
+if  [ $clang_version -ge 18 ]; then
+    >&2 echo "clang is greater or equal version 18";
+    required_dwarf_version=5
+fi
+
+if [ -e /etc/fedora-release ]; then
+    fedora_version=$(grep -ioP "Fedora release \K[0-9]+" /etc/fedora-release)
+    if [ $fedora_version -le 38 ]; then
+        required_dwarf_version=4
+    fi
 fi
 
 echo "int main(){ return 0; }" | clang -g -v -x c - 2> build.log