Removed two regression tests because the output (number of errors) varied between...

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

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 54ff4d694c3ede2e85b906b5597e8659f749a635..21f56bdad80551e265d9d76e245523c8eea29920 100644 (file)
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -15,10 +15,6 @@ noinst_HEADERS =                                    \
 EXTRA_DIST =                                        \
        annotate_order_1.stderr.exp                 \
        annotate_order_1.vgtest                     \
-       annotate_order_2.stderr.exp                 \
-       annotate_order_2.vgtest                     \
-       annotate_order_3.stderr.exp                 \
-       annotate_order_3.vgtest                     \
        annotate_spinlock.stderr.exp                \
        annotate_spinlock.vgtest                    \
        annotate_rwlock.stderr.exp                  \

diff --git a/drd/tests/annotate_order_2.stderr.exp b/drd/tests/annotate_order_2.stderr.exp
deleted file mode 100644 (file)
index 731cd66..0000000
--- a/drd/tests/annotate_order_2.stderr.exp
+++ /dev/null
@@ -1,6 +0,0 @@
-
-FLAGS [phb=1, fm=0]
-test30: negative
-       GLOB=47
-
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/drd/tests/annotate_order_2.vgtest b/drd/tests/annotate_order_2.vgtest
deleted file mode 100644 (file)
index 8b22fbb..0000000
--- a/drd/tests/annotate_order_2.vgtest
+++ /dev/null
@@ -1,5 +0,0 @@
-prereq: test -e tsan_unittest && ./supported_libpthread
-vgopts: --read-var-info=yes --check-stack-var=yes --show-confl-seg=no
-prog: tsan_unittest
-args: 30
-stderr_filter: filter_stderr_and_thread_no

diff --git a/drd/tests/annotate_order_3.stderr.exp b/drd/tests/annotate_order_3.stderr.exp
deleted file mode 100644 (file)
index a5a9f85..0000000
--- a/drd/tests/annotate_order_3.stderr.exp
+++ /dev/null
@@ -1,6 +0,0 @@
-
-FLAGS [phb=1, fm=0]
-test31: negative
-       GLOB=48
-
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/drd/tests/annotate_order_3.vgtest b/drd/tests/annotate_order_3.vgtest
deleted file mode 100644 (file)
index 76b4595..0000000
--- a/drd/tests/annotate_order_3.vgtest
+++ /dev/null
@@ -1,5 +0,0 @@
-prereq: test -e tsan_unittest && ./supported_libpthread
-vgopts: --read-var-info=yes --check-stack-var=yes --show-confl-seg=no
-prog: tsan_unittest
-args: 31
-stderr_filter: filter_stderr_and_thread_no