message: Fixed lldbtest.py, which got horrifically mangled in the merge.
diff: import time
  import traceback
  import types
  - import lldb
  # Third-party modules
  import unittest2
  from . import lldbplatformutil
  from . import lldbtest_config
  from . import lldbutil
  - from . import lock
  from . import test_categories
  from lldbsuite.support import encoded_file
  from lldbsuite.support import funcutils
  os.chdir(os.path.join(os.environ["LLDB_TEST"], cls.mydir))
  if debug_confirm_directory_exclusivity:
  + import lock
  cls.dir_lock = lock.Lock(os.path.join(full_dir, ".dirlock"))
  try:
  cls.dir_lock.try_acquire()
  option_str = ""
  if comp:
  option_str += " -C " + comp
  - if lldb.remote_platform:
  - option_str += ' --platform-name=%s' % (lldb.remote_platform_name)
  return option_str
  # ==================================================
  "llvm-build/Debug+Asserts/x86_64/Debug+Asserts/bin/clang",
  "llvm-build/Release/x86_64/Release/bin/clang",
  "llvm-build/Debug/x86_64/Debug/bin/clang",
  - "llvm-build/ReleaseAsserts/llvm-macosx-x86_64/bin/clang",
  - "llvm-build/DebugAsserts/llvm-macosx-x86_64/bin/clang",
  - "llvm-build/Release/llvm-macosx-x86_64/bin/clang",
  - "llvm-build/Debug/llvm-macosx-x86_64/bin/clang",
  ]
  lldb_root_path = os.path.join(
  os.path.dirname(__file__), "..", "..", "..", "..")
  