ed268f2
Fix has been committed to:
ed268f2
	gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch
ed268f2
22d1e60
Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/watchpoint-during-step.exp
22d1e60
===================================================================
22d1e60
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
22d1e60
+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/watchpoint-during-step.exp	2016-02-15 23:34:10.455248408 +0100
dd46ae6
@@ -0,0 +1,44 @@
ed268f2
+# Copyright 2007 Free Software Foundation, Inc.
ed268f2
+
ed268f2
+# This program is free software; you can redistribute it and/or modify
ed268f2
+# it under the terms of the GNU General Public License as published by
ed268f2
+# the Free Software Foundation; either version 2 of the License, or
ed268f2
+# (at your option) any later version.
ed268f2
+# 
ed268f2
+# This program is distributed in the hope that it will be useful,
ed268f2
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
ed268f2
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
ed268f2
+# GNU General Public License for more details.
ed268f2
+# 
ed268f2
+# You should have received a copy of the GNU General Public License
ed268f2
+# along with this program; if not, write to the Free Software
ed268f2
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
ed268f2
+
ed268f2
+set testfile watchpoint-during-step
ed268f2
+set srcfile ${testfile}.c
22d1e60
+set binfile [standard_output_file ${testfile}]
ed268f2
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
ed268f2
+    untested "Couldn't compile test program"
ed268f2
+    return -1
ed268f2
+}
ed268f2
+
ed268f2
+# Get things started.
ed268f2
+
ed268f2
+gdb_exit
ed268f2
+gdb_start
ed268f2
+gdb_reinitialize_dir $srcdir/$subdir
ed268f2
+gdb_load ${binfile}
ed268f2
+
ed268f2
+runto_main
ed268f2
+
ed268f2
+gdb_breakpoint [gdb_get_line_number "var = 2"]
ed268f2
+gdb_continue_to_breakpoint "Find the first var set"
ed268f2
+
ed268f2
+gdb_test "step" ".*var = 3;" "Step to the next var set"
ed268f2
+
ed268f2
+gdb_test "watch var" "atchpoint .*: var" "Set the watchpoint"
ed268f2
+
ed268f2
+# Here is the target point.  Be careful to not have breakpoint set on the line
ed268f2
+# we step from as in this case it is a valid upstream KFAIL gdb/38
ed268f2
+
ed268f2
+gdb_test "step" ".*Old value = 2.*New value = 3.*" "Catch the watchpoint"
22d1e60
Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/watchpoint-during-step.c
22d1e60
===================================================================
22d1e60
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
22d1e60
+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/watchpoint-during-step.c	2016-02-15 23:32:51.846690279 +0100
ed268f2
@@ -0,0 +1,30 @@
ed268f2
+/* This testcase is part of GDB, the GNU debugger.
ed268f2
+
ed268f2
+   Copyright 2007 Free Software Foundation, Inc.
ed268f2
+
ed268f2
+   This program is free software; you can redistribute it and/or modify
ed268f2
+   it under the terms of the GNU General Public License as published by
ed268f2
+   the Free Software Foundation; either version 2 of the License, or
ed268f2
+   (at your option) any later version.
ed268f2
+
ed268f2
+   This program is distributed in the hope that it will be useful,
ed268f2
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
ed268f2
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
ed268f2
+   GNU General Public License for more details.
ed268f2
+ 
ed268f2
+   You should have received a copy of the GNU General Public License
ed268f2
+   along with this program; if not, write to the Free Software
ed268f2
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
ed268f2
+
ed268f2
+   Please email any bugs, comments, and/or additions to this file to:
ed268f2
+   bug-gdb@prep.ai.mit.edu  */
ed268f2
+
ed268f2
+static int var;
ed268f2
+
ed268f2
+int main()
ed268f2
+{
ed268f2
+  var = 1;
ed268f2
+  var = 2;
ed268f2
+  var = 3;
ed268f2
+  return 0;
ed268f2
+}