[Lldb-commits] [lldb] r324115 - Use an alternative approach to prevent Spotlight from indexing the build directory.

[Adrian Prantl via lldb-commits]

Author: adrian
Date: Fri Feb  2 10:32:29 2018
New Revision: 324115

URL: http://llvm.org/viewvc/llvm-project?rev=324115&view=rev
Log:
Use an alternative approach to prevent Spotlight from indexing the build directory.

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/dotest.py
    lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py
    lldb/trunk/test/CMakeLists.txt

Modified: lldb/trunk/packages/Python/lldbsuite/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/dotest.py?rev=324115&r1=324114&r2=324115&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest.py Fri Feb  2 10:32:29 2018
@@ -1200,14 +1200,6 @@ def run_suite():
     build_dir = configuration.test_build_dir
     lldbutil.mkdir_p(build_dir)
 
-    # Create a marker for Spotlight to never index $BUILD_DIR.  LLDB
-    # queries Spotlight to locate .dSYM bundles based on the UUID
-    # embedded in a binary, and because the UUID is a hash of filename
-    # and .text section, there *will* be conflicts inside $BUILD_DIR.
-    if platform.system() == "Darwin":
-        with open(os.path.join(build_dir, '.metadata_never_index'), 'w+'):
-            pass
-
     target_platform = lldb.DBG.GetSelectedPlatform().GetTriple().split('-')[2]
 
     checkLibcxxSupport()

Modified: lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py?rev=324115&r1=324114&r2=324115&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/dotest_args.py Fri Feb  2 10:32:29 2018
@@ -163,7 +163,7 @@ def create_parser():
         '--build-dir',
         dest='test_build_dir',
         metavar='Test build directory',
-        default='lldb-test-build',
+        default='lldb-test-build.noindex',
         help='The root build directory for the tests. It will be removed before running.')
 
     # Configuration options

Modified: lldb/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/CMakeLists.txt?rev=324115&r1=324114&r2=324115&view=diff
==============================================================================
--- lldb/trunk/test/CMakeLists.txt (original)
+++ lldb/trunk/test/CMakeLists.txt Fri Feb  2 10:32:29 2018
@@ -57,13 +57,18 @@ set(LLDB_TEST_USER_ARGS
   ""
   CACHE STRING "Specify additional arguments to pass to test runner. For example: '-C gcc -C clang -A i386 -A x86_64'")
 
+# The .nodindex suffix is a marker for Spotlight to never index the
+# build directory.  LLDB queries Spotlight to locate .dSYM bundles
+# based on the UUID embedded in a binary, and because the UUID is a
+# hash of filename and .text section, there *will* be conflicts inside
+# the build directory.
 set(LLDB_TEST_COMMON_ARGS
   --arch=${LLDB_TEST_ARCH}
   --executable $<TARGET_FILE:lldb>
   -s
   ${CMAKE_BINARY_DIR}/lldb-test-traces
   --build-dir
-  ${CMAKE_BINARY_DIR}/lldb-test-build
+  ${CMAKE_BINARY_DIR}/lldb-test-build.noindex
   -S nm
   -u CXXFLAGS
   -u CFLAGS