---

yaml
---
r: 127293
b: refs/heads/try
c: b68d0e3
h: refs/heads/master
i:
  127291: 9c40143
v: v3

Author: michaelwoerister

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 87d2bf400ce1bc2cec832f9d5b8e763f06bb7f43
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 12e0f72f517516ac4fce2aed85e6142e9b874bce
-refs/heads/try: 031fbab4b38974ac20d9edc25a2dea7f88ec0f1f
+refs/heads/try: b68d0e30837cf5be4df87888f208865833bb11fb
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/configure

@@ -422,7 +422,7 @@ opt ccache 0 "invoke gcc/clang via ccache to reuse object files between builds"
 opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
 opt inject-std-version 1 "inject the current compiler version of libstd into programs"
 opt llvm-static-stdcpp 0 "statically link to libstdc++ for LLVM"
-opt rpath 0 "build rpaths into rustc itself"
+opt rpath 1 "build rpaths into rustc itself"
 opt nightly 0 "build nightly packages"
 opt verify-install 1 "verify installed binaries work"
 opt jemalloc 1 "build liballoc with jemalloc"
@@ -511,20 +511,9 @@ probe CFG_LLDB             lldb
 
 if [ ! -z "$CFG_LLDB" ]
 then
-    # If CFG_LLDB_PYTHON_DIR is not already set from the outside and valid, try to read it from
-    # LLDB via the -P commandline options.
-    if [ -z "$CFG_LLDB_PYTHON_DIR" ] || [ ! -d "$CFG_LLDB_PYTHON_DIR" ]
-    then
-        CFG_LLDB_PYTHON_DIR=$($CFG_LLDB -P)
-
-        # If CFG_LLDB_PYTHON_DIR is not a valid directory, set it to something more readable
-        if [ ! -d "$CFG_LLDB_PYTHON_DIR" ]
-        then
-            CFG_LLDB_PYTHON_DIR="LLDB_PYTHON_DIRECTORY_NOT_FOUND"
-        fi
-
-        putvar CFG_LLDB_PYTHON_DIR
-    fi
+    # Try-branch hack
+    CFG_LLDB_PYTHON_DIR="/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/Resources/Python"
+    putvar CFG_LLDB_PYTHON_DIR
 fi
 
 step_msg "looking for target specific programs"

branches/try/mk/tests.mk

@@ -179,10 +179,7 @@ check-notidy: cleantmptestlogs cleantestlibs all check-stage2
 	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
 
 # A slightly smaller set of tests for smoke testing.
-check-lite: cleantestlibs cleantmptestlogs \
-	$(foreach crate,$(TEST_TARGET_CRATES),check-stage2-$(crate)) \
-	check-stage2-rpass \
-	check-stage2-rfail check-stage2-cfail check-stage2-rmake
+check-lite: cleantestlibs cleantmptestlogs check-stage1-debuginfo-lldb \
 	$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
 
 # Only check the 'reference' tests: rpass/cfail/rfail/rmake.

branches/try/src/etc/lldb_batchmode.py

@@ -30,9 +30,10 @@
 import threading
 import re
 import atexit
+import time
 
 # Set this to True for additional output
-DEBUG_OUTPUT = False
+DEBUG_OUTPUT = True
 
 def print_debug(s):
   "Print something if DEBUG_OUTPUT is True"
@@ -104,26 +105,32 @@ def execute_command(command_interpreter, command):
 
 def start_breakpoint_listener(target):
   "Listens for breakpoints being added and adds new ones to the callback registration list"
+  print_debug("Creating breakpoint listener object")
   listener = lldb.SBListener("breakpoint listener")
 
   def listen():
+    print_debug("Started listening...")
     event = lldb.SBEvent()
+    listening_start_time_secs = time.clock()
+    MAX_LISTENING_TIME_SECS = 10
     try:
-      while True:
-        if listener.WaitForEvent(120, event):
+      while time.clock() < (listening_start_time_secs + MAX_LISTENING_TIME_SECS):
+        if listener.WaitForEvent(1, event):
           if lldb.SBBreakpoint.EventIsBreakpointEvent(event) and \
              lldb.SBBreakpoint.GetBreakpointEventTypeFromEvent(event) == \
              lldb.eBreakpointEventTypeAdded:
             global new_breakpoints
             breakpoint = lldb.SBBreakpoint.GetBreakpointFromEvent(event)
             print_debug("breakpoint added, id = " + str(breakpoint.id))
             new_breakpoints.append(breakpoint.id)
-    except:
-      print_debug("breakpoint listener shutting down")
+    except Exception as e:
+      print_debug("exception in breakpoint listener (shutting down): " + str(e))
 
   # Start the listener and let it run as a daemon
+  print_debug("Creating listener thread")
   listener_thread = threading.Thread(target = listen)
   listener_thread.daemon = True
+  print_debug("Starting listener thread")
   listener_thread.start()
 
   # Register the listener with the target
@@ -143,10 +150,12 @@ def listen():
 
 
 # Create a new debugger instance
+print_debug("Creating LLDB debugger instance")
 debugger = lldb.SBDebugger.Create()
 
 # When we step or continue, don't return from the function until the process
 # stops. We do this by setting the async mode to false.
+print_debug("Switching debugger to async mode")
 debugger.SetAsync(False)
 
 # Create a target from a file and arch