From: Mark Wielaard <mjw@redhat.com>
Date: Sat, 21 Dec 2013 18:39:19 +0000 (+0100)
Subject: tests: backtrace.c only check we caught the last instruction on x86_64.
X-Git-Tag: elfutils-0.158~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6ef1ce4695cea00d097c7fcac8d0014ff01a5bf;p=thirdparty%2Felfutils.git

tests: backtrace.c only check we caught the last instruction on x86_64.

On some architectures gcc might introduce some "padding instructions"
at the end of the function (like on ppc64). So only assert we are at the
last instruction of backtracegen if on x86_64 native. In theory the assert
could even fail on that architectures, but in practice it doesn't and it
is a nice test to have.

Signed-off-by: Mark Wielaard <mjw@redhat.com>
---

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 0d91c3b2c..23c5051da 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-21  Mark Wielaard  <mjw@redhat.com>
+
+	* backtrace.c (callback_verify): Only assert that case 5 is the last
+	instruction of backtracegen on x86_64 native.
+
 2013-12-18  Jan Kratochvil  <jan.kratochvil@redhat.com>
 	    Mark Wielaard  <mjw@redhat.com>
 
diff --git a/tests/backtrace.c b/tests/backtrace.c
index 06d387821..8a7d6dfcb 100644
--- a/tests/backtrace.c
+++ b/tests/backtrace.c
@@ -118,7 +118,13 @@ callback_verify (pid_t tid, unsigned frameno, Dwarf_Addr pc,
       mod = dwfl_addrmodule (dwfl, pc);
       if (mod)
 	symname2 = dwfl_module_addrname (mod, pc);
-      assert (symname2 == NULL || strcmp (symname2, "backtracegen") != 0);
+
+      // Note that the following assert might in theory even fail on x86_64,
+      // there is no guarantee that the compiler doesn't reorder the
+      // instructions or even inserts some padding instructions at the end
+      // (which apparently happens on ppc64).
+      if (is_x86_64_native)
+        assert (symname2 == NULL || strcmp (symname2, "backtracegen") != 0);
       break;
   }
 }