From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Sat, 16 Mar 2024 16:00:17 +0000 (+0100)
Subject: regtest: use in 'if' in memcheck/tests/manuel1
X-Git-Tag: VALGRIND_3_23_0~104
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=203b7356b56bb4e2b86c37d45af017c39c995161;p=thirdparty%2Fvalgrind.git

regtest: use in 'if' in memcheck/tests/manuel1

clang tends to use cmov and csel instructions with the result
that the undefinedness propagates into the printf with a variable
number of errors.
---

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index ea8f3e90d..150e632cc 100644
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -259,7 +259,6 @@ EXTRA_DIST = \
 	malloc2.stderr.exp malloc2.vgtest \
 	malloc3.stderr.exp malloc3.stdout.exp malloc3.vgtest \
 	manuel1.stderr.exp manuel1.stdout.exp manuel1.vgtest \
-		manuel1.stderr.exp-freebsd-clang \
 	manuel2.stderr.exp manuel2.stderr.exp64 manuel2.stdout.exp \
 		manuel2.vgtest \
 	manuel3.stderr.exp manuel3.vgtest \
diff --git a/memcheck/tests/manuel1.c b/memcheck/tests/manuel1.c
index f2030e4b7..39b6c9ef2 100644
--- a/memcheck/tests/manuel1.c
+++ b/memcheck/tests/manuel1.c
@@ -4,7 +4,14 @@ int main ()
 {
   int x;
 
-  printf ("x = %d\n", x==0xCAFEBABE ? 99 : 88);
+  if (x==0xCAFEBABE)
+  {
+    printf ("x = %d\n", 99);
+  }
+  else
+  {
+    printf ("x = %d\n", 88);
+  }
 
   return 0;
 }
diff --git a/memcheck/tests/manuel1.stderr.exp-freebsd-clang b/memcheck/tests/manuel1.stderr.exp-freebsd-clang
deleted file mode 100644
index e658adb7e..000000000
--- a/memcheck/tests/manuel1.stderr.exp-freebsd-clang
+++ /dev/null
@@ -1,33 +0,0 @@
-[[[
-Conditional jump or move depends on uninitialised value(s)
-   ...
-   by 0x........: main (manuel1.c:7)
-
-[[[
-Conditional jump or move depends on uninitialised value(s)
-   ...
-   by 0x........: main (manuel1.c:7)
-
-[[[
-Conditional jump or move depends on uninitialised value(s)
-   ...
-   by 0x........: main (manuel1.c:7)
-
-[[[
-Conditional jump or move depends on uninitialised value(s)
-   ...
-   by 0x........: main (manuel1.c:7)
-
-[[[
-Conditional jump or move depends on uninitialised value(s)
-   ...
-   by 0x........: main (manuel1.c:7)
-
-[[[
-Syscall param write(buf) points to uninitialised byte(s)
-   ...
- Address 0x........ is 4 bytes inside a block of size 131,072 alloc'd
-   at 0x........: malloc (vg_replace_malloc.c:...)
-   ...
-   by 0x........: main (manuel1.c:7)
-