Use an alternative approach to prevent Spotlight from indexing the build directory.
llvm-svn: 324115
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py
index 51f12e3..800a60e 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest.py
@@ -1200,14 +1200,6 @@
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()
diff --git a/lldb/packages/Python/lldbsuite/test/dotest_args.py b/lldb/packages/Python/lldbsuite/test/dotest_args.py
index c2aa3b7..c6e4a4b 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest_args.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py
@@ -163,7 +163,7 @@
'--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
diff --git a/lldb/test/CMakeLists.txt b/lldb/test/CMakeLists.txt
index 64bbfe9..2877900 100644
--- a/lldb/test/CMakeLists.txt
+++ b/lldb/test/CMakeLists.txt
@@ -57,13 +57,18 @@
""
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