Revert "Disable drd/tests/annotate_trace_memory[_xml].vgtest on arm and ppc."

The tests have been changed to not depend on atomic 64bit add_and_fetch.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13408

diff --git a/drd/tests/annotate_trace_memory.vgtest b/drd/tests/annotate_trace_memory.vgtest
index aa5b94b4d8b6b656ac762499c15a5bf1169fb59d..20d5a518aa0f7539096e6f3f35f0958a911352b0 100644 (file)
--- a/drd/tests/annotate_trace_memory.vgtest
+++ b/drd/tests/annotate_trace_memory.vgtest
@@ -1,4 +1,4 @@
-prereq: test -e annotate_trace_memory && ./supported_libpthread && ! ../../tests/arch_test arm && ! ../../tests/arch_test ppc32 && ! ../../tests/arch_test ppc64
+prereq: test -e annotate_trace_memory && ./supported_libpthread
 vgopts: --read-var-info=yes --check-stack-var=yes --show-confl-seg=no --num-callers=2
 prog: annotate_trace_memory
 stderr_filter: filter_stderr_and_thread_no

diff --git a/drd/tests/annotate_trace_memory_xml.vgtest b/drd/tests/annotate_trace_memory_xml.vgtest
index 30152332bd988acc1df0ddc33f92672e097243ce..48da0cb4bdb25a9a5942061ee3be30ca71dcde08 100644 (file)
--- a/drd/tests/annotate_trace_memory_xml.vgtest
+++ b/drd/tests/annotate_trace_memory_xml.vgtest
@@ -1,4 +1,4 @@
-prereq: test -e annotate_trace_memory && ./supported_libpthread && ! ../../tests/arch_test arm && ! ../../tests/arch_test ppc32 && ! ../../tests/arch_test ppc64
+prereq: test -e annotate_trace_memory && ./supported_libpthread
 vgopts: --read-var-info=yes --check-stack-var=yes --show-confl-seg=no --num-callers=2 --xml=yes --xml-fd=2
 prog: annotate_trace_memory
 stderr_filter: ./filter_xml_and_thread_no