Bug 487055 - memcheck/tests/x86-linux/scalar fails running in Docker

Also move to 3.27.0.GIT.

Will this fix some of the failures in the nightly tests?

diff --git a/NEWS b/NEWS
index fdeebfaead9050b9fd43b6e7ba55d0d674367cb3..2ecf886a20db5044f053021a3efe7b1af2ff68eb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,39 @@
+Release 3.27.0 (?? Apr 2025)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This release supports X86/Linux, AMD64/Linux, ARM32/Linux, ARM64/Linux,
+PPC32/Linux, PPC64BE/Linux, PPC64LE/Linux, S390X/Linux, MIPS32/Linux,
+MIPS64/Linux, RISCV64/Linux, ARM/Android, ARM64/Android, MIPS32/Android,
+X86/Android, X86/Solaris, AMD64/Solaris, AMD64/MacOSX 10.12, X86/FreeBSD,
+AMD64/FreeBSD and ARM64/FreeBSD There is also preliminary support for
+X86/macOS 10.13, AMD64/macOS 10.13 and nanoMIPS/Linux.
+
+* ==================== CORE CHANGES ===================
+
+* ================== PLATFORM CHANGES =================
+
+
+* ==================== TOOL CHANGES ===================
+
+
+* ==================== FIXED BUGS ====================
+
+The following bugs have been fixed or resolved.  Note that "n-i-bz"
+stands for "not in bugzilla" -- that is, a bug that was reported to us
+but never got a bugzilla entry.  We encourage you to file bugs in
+bugzilla (https://bugs.kde.org/enter_bug.cgi?product=valgrind) rather
+than mailing the developers (or mailing lists) directly -- bugs that
+are not entered into bugzilla tend to get forgotten about or ignored.
+
+487055  memcheck/tests/x86-linux/scalar fails running in Docker
+
+To see details of a given bug, visit
+  https://bugs.kde.org/show_bug.cgi?id=XXXXXX
+where XXXXXX is the bug number as listed above.
+
+(3.27.0.RC1: ?? Apr 2025)
+
+
 Release 3.26.0 (24 Oct 2025)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/configure.ac b/configure.ac
index e30e4c1a1e35387db006de11bd8df84ac3d1f65d..64b2339892f4c9ff72964428ef121daebd2b3b56 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,10 +16,10 @@ AC_PREREQ(2.69)
 # Also set the (expected/last) release date here.
 # Do not forget to rerun ./autogen.sh
 m4_define([v_major_ver], [3])
-m4_define([v_minor_ver], [26])
+m4_define([v_minor_ver], [27])
 m4_define([v_micro_ver], [0])
-m4_define([v_suffix_ver], [])
-m4_define([v_rel_date], ["24 Oct 2025"])
+m4_define([v_suffix_ver], [GIT])
+m4_define([v_rel_date], ["?? Apr 2026"])
 m4_define([v_version],
          m4_if(v_suffix_ver, [],
                [v_major_ver.v_minor_ver.v_micro_ver],

diff --git a/memcheck/tests/x86-linux/scalar.c b/memcheck/tests/x86-linux/scalar.c
index e6ff44fe0e9f1cb671700293bd634a9fe7dbdac8..8a04e4bc7e0ff3843ebdfee9d0e312bf33b86689 100644 (file)
--- a/memcheck/tests/x86-linux/scalar.c
+++ b/memcheck/tests/x86-linux/scalar.c
@@ -33,6 +33,11 @@ int main(void)
    long  x0  = px[0];
    long  res;
 
+   int in_docker = 0;
+   if (access("/.dockerenv", F_OK) == 0) {
+      in_docker = 1;
+   }
+
    // All __NR_xxx numbers are taken from x86
 
    // __NR_restart_syscall 0  // XXX: not yet handled, perhaps should be...
@@ -191,7 +196,12 @@ int main(void)
 
    // __NR_nice 34
    GO(__NR_nice, "1s 0m");
-   SY(__NR_nice, x0); SUCC;
+   SY(__NR_nice, x0);
+   if (in_docker) {
+      FAIL;
+   } else {
+      SUCC;
+   }
 
    // __NR_ftime 35
    GO(__NR_ftime, "ni");