From 48a4d84acb97aef98c7d5797c928141b257a8935 Mon Sep 17 00:00:00 2001 From: Paul Floyd Date: Fri, 30 Jan 2026 21:21:57 +0100 Subject: [PATCH] Regtest: fix build for old compilers without aligned new/delete --- memcheck/tests/Makefile.am | 6 +++--- memcheck/tests/xmas_tree_xml.vgtest | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am index 6a6eee61d..89937a7cb 100644 --- a/memcheck/tests/Makefile.am +++ b/memcheck/tests/Makefile.am @@ -578,8 +578,7 @@ check_PROGRAMS = \ wmemcmp \ wrap1 wrap2 wrap3 wrap4 wrap5 wrap6 wrap7 wrap7so.so wrap8 \ wrapmalloc wrapmallocso.so wrapmallocstatic \ - writev1 \ - xmas_tree + writev1 if !SOLARIS_SUN_STUDIO_AS # Sun Studio assembler fails on "IDENT too long" @@ -627,7 +626,8 @@ check_PROGRAMS += cxx17_aligned_new sized_aligned_new_delete_args \ new_aligned_delete_default \ sized_aligned_new_delete_misaligned1 \ sized_aligned_new_delete_misaligned2 \ - sized_aligned_new_delete_misaligned3 + sized_aligned_new_delete_misaligned3 \ + xmas_tree endif if HAVE_CLOSE_RANGE diff --git a/memcheck/tests/xmas_tree_xml.vgtest b/memcheck/tests/xmas_tree_xml.vgtest index 5061ad12a..673eae3a1 100644 --- a/memcheck/tests/xmas_tree_xml.vgtest +++ b/memcheck/tests/xmas_tree_xml.vgtest @@ -1,4 +1,4 @@ -prereq: which xmllint > /dev/null +prereq: test -e xmas_tree && which xmllint > /dev/null prog: xmas_tree args: | xmllint --noout - vgopts: --xml=yes --xml-fd=1 --leak-check=full --suppressions=xmas_tree_xml.supp --leak-check-heuristics=multipleinheritance -- 2.47.3