From: Dirk Mueller <daywalker@users.sourceforge.net>
Date: Thu, 1 Dec 2005 10:01:24 +0000 (+0000)
Subject: merge from trunk:
X-Git-Tag: svn/VALGRIND_3_1_1~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30c9d78af4f136d84726b23fe0b118f9d501504c;p=thirdparty%2Fvalgrind.git

merge from trunk:

r5241 | njn | 2005-11-27 20:11:34 +0100 (Sun, 27 Nov 2005) | 3 lines
Disable 'yield' -- it fails so often that it's useless.


git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_1_BRANCH@5257
---

diff --git a/none/tests/x86/Makefile.am b/none/tests/x86/Makefile.am
index b42949383c..022dda35a2 100644
--- a/none/tests/x86/Makefile.am
+++ b/none/tests/x86/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
 	seg_override.stderr.exp seg_override.stdout.exp seg_override.vgtest \
 	sigcontext.stdout.exp sigcontext.stderr.exp sigcontext.vgtest \
 	smc1.stderr.exp smc1.stdout.exp smc1.vgtest \
-	yield.stderr.exp yield.stdout.exp yield.vgtest
+	yield.stderr.exp yield.stdout.exp yield.disabled
 
 check_PROGRAMS = \
 	badseg bt_everything bt_literal cmpxchg8b cpuid \
diff --git a/none/tests/x86/yield.disabled b/none/tests/x86/yield.disabled
new file mode 100644
index 0000000000..62f1a8e86d
--- /dev/null
+++ b/none/tests/x86/yield.disabled
@@ -0,0 +1,3 @@
+# This one is currently disabled because it fails frequently and randomly
+# and so is no use at all.
+prog: yield
diff --git a/none/tests/x86/yield.vgtest b/none/tests/x86/yield.vgtest
deleted file mode 100644
index 49e68a74a2..0000000000
--- a/none/tests/x86/yield.vgtest
+++ /dev/null
@@ -1 +0,0 @@
-prog: yield