Index: lldb/trunk/test/tools/lldb-mi/breakpoint/TestMiBreak.py
===================================================================
--- lldb/trunk/test/tools/lldb-mi/breakpoint/TestMiBreak.py
+++ lldb/trunk/test/tools/lldb-mi/breakpoint/TestMiBreak.py
@@ -178,28 +178,36 @@
         self.runCmd("-break-insert -f main.cpp:%d" % line)
         self.expect("\^done,bkpt={number=\"1\"")
 
+        # Test that non-pending BP will not be set on non-existing line if target.move-to-nearest-code=off
+        self.runCmd("-break-insert main.cpp:%d" % line)
+        self.expect("\^error,msg=\"Command 'break-insert'. Breakpoint location 'main.cpp:%d' not found\"" % line)
+
         # Set target.move-to-nearest-code=on and target.skip-prologue=on and set BP #2
         self.runCmd("-interpreter-exec console \"settings set target.move-to-nearest-code on\"")
         self.runCmd("-interpreter-exec console \"settings set target.skip-prologue on\"")
         self.expect("\^done")
+        # FIXME BP was increased by 1 after setting non-pending BP on unknown location (number should be 2)
         self.runCmd("-break-insert main.cpp:%d" % line)
-        self.expect("\^done,bkpt={number=\"2\"")
+        self.expect("\^done,bkpt={number=\"3\"")
 
         # Set target.skip-prologue=off and set BP #3
         self.runCmd("-interpreter-exec console \"settings set target.skip-prologue off\"")
         self.expect("\^done")
+        # FIXME BP was increased by 1 after setting non-pending BP on unknown location (number should be 3)
         self.runCmd("-break-insert main.cpp:%d" % line)
-        self.expect("\^done,bkpt={number=\"3\"")
+        self.expect("\^done,bkpt={number=\"4\"")
 
         # Test that BP #3 is located before BP #2
         self.runCmd("-exec-run")
         self.expect("\^running")
-        self.expect("\*stopped,reason=\"breakpoint-hit\",disp=\"del\",bkptno=\"3\"")
+        # FIXME BP was increased by 1 after setting non-pending BP on unknown location (bkptno should be 3)
+        self.expect("\*stopped,reason=\"breakpoint-hit\",disp=\"del\",bkptno=\"4\"")
 
         # Test that BP #2 is hit
         self.runCmd("-exec-continue")
         self.expect("\^running")
-        self.expect("\*stopped,reason=\"breakpoint-hit\",disp=\"del\",bkptno=\"2\"")
+        # FIXME BP was increased by 1 after setting non-pending BP on unknown location (bkptno should be 2)
+        self.expect("\*stopped,reason=\"breakpoint-hit\",disp=\"del\",bkptno=\"3\"")
 
         # Test that BP #1 wasn't set
         self.runCmd("-exec-continue")