Regtest: fix build for old compilers without aligned new/delete

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 6a6eee61df4043c3e130247b257142274cdb3e36..89937a7cb8b7f39982f5918cd7933ec44492adbf 100644 (file)
--- 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 5061ad12a466620d74b900941b9e438b77966964..673eae3a14cbc5089432b142f09c41177120d44a 100644 (file)
--- 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