diff --git a/libcxx/test/configs/apple-libc++-backdeployment.cfg.in b/libcxx/test/configs/apple-libc++-backdeployment.cfg.in --- a/libcxx/test/configs/apple-libc++-backdeployment.cfg.in +++ b/libcxx/test/configs/apple-libc++-backdeployment.cfg.in @@ -12,32 +12,14 @@ lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg') BACKDEPLOYMENT_PARAMETERS = [ - libcxx.test.dsl.Parameter(name='cxx_runtime_root', type=str, - actions=lambda root: [libcxx.test.dsl.AddSubstitution('%{cxx-runtime-root}', root)], + libcxx.test.dsl.Parameter(name='dyld_library_path', type=str, + actions=lambda path: [libcxx.test.dsl.AddSubstitution('%{dyld-library-path}', path)], help=""" - The simulated root of the system (for libc++) when running tests. + The simulated root of the system when running tests. - This should be a directory hierarchy under which the libc++ dylib can be found. - The dylib in that hierarchy is the one that will be used at runtime when running - the tests. - """), - libcxx.test.dsl.Parameter(name='abi_runtime_root', type=str, - actions=lambda root: [libcxx.test.dsl.AddSubstitution('%{abi-runtime-root}', root)], - help=""" - The simulated root of the system (for libc++abi) when running tests. - - This should be a directory hierarchy under which the libc++abi dylib can be found. - The dylib in that hierarchy is the one that will be used at runtime when running - the tests. - """), - libcxx.test.dsl.Parameter(name='unwind_runtime_root', type=str, - actions=lambda root: [libcxx.test.dsl.AddSubstitution('%{unwind-runtime-root}', root)], - help=""" - The simulated root of the system (for libunwind) when running tests. - - This should be a directory hierarchy under which the libunwind dylib can be found. - The dylib in that hierarchy is the one that will be used at runtime when running - the tests. + This should be a directory hierarchy under which the libc++, libc++abi and libunwind dylibs + can be found. The dylibs in that hierarchy are the one that will be used at runtime when + running the tests. """), ] @@ -51,7 +33,7 @@ '-nostdlib++ -L %{lib} -lc++' )) config.substitutions.append(('%{exec}', - '%{executor} --execdir %T --env DYLD_LIBRARY_PATH="%{cxx-runtime-root}:%{abi-runtime-root}:%{unwind-runtime-root}" -- ' + '%{executor} --execdir %T --env DYLD_LIBRARY_PATH="%{dyld-library-path}" -- ' )) config.stdlib = 'apple-libc++' diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot --- a/libcxx/utils/ci/run-buildbot +++ b/libcxx/utils/ci/run-buildbot @@ -29,7 +29,7 @@ this is '/build/'. --osx-roots Path to pre-downloaded macOS dylibs. By default, we download - them from Green Dragon. This is only relevant at all when + them from a private dropbox. This is only relevant at all when running back-deployment testing if one wants to override the old dylibs we use to run the tests with different ones. Environment variables @@ -498,16 +498,12 @@ # TODO: On Apple platforms, we never produce libc++abi.1.dylib or libunwind.1.dylib, # only libc++abi.dylib and libunwind.dylib. Fix that in the build so that the # tests stop searching for @rpath/libc++abi.1.dylib and @rpath/libunwind.1.dylib. - cp "${OSX_ROOTS}/macOS/libc++abi/${DEPLOYMENT_TARGET}/libc++abi.dylib" \ - "${OSX_ROOTS}/macOS/libc++abi/${DEPLOYMENT_TARGET}/libc++abi.1.dylib" - cp "${OSX_ROOTS}/macOS/libunwind/${DEPLOYMENT_TARGET}/libunwind.dylib" \ - "${OSX_ROOTS}/macOS/libunwind/${DEPLOYMENT_TARGET}/libunwind.1.dylib" + cp "${OSX_ROOTS}/macOS/${DEPLOYMENT_TARGET}/libc++abi.dylib" "${OSX_ROOTS}/macOS/${DEPLOYMENT_TARGET}/libc++abi.1.dylib" + cp "${OSX_ROOTS}/macOS/${DEPLOYMENT_TARGET}/libunwind.dylib" "${OSX_ROOTS}/macOS/${DEPLOYMENT_TARGET}/libunwind.1.dylib" arch="$(uname -m)" PARAMS="target_triple=${arch}-apple-macosx${DEPLOYMENT_TARGET}" - PARAMS+=";cxx_runtime_root=${OSX_ROOTS}/macOS/libc++/${DEPLOYMENT_TARGET}" - PARAMS+=";abi_runtime_root=${OSX_ROOTS}/macOS/libc++abi/${DEPLOYMENT_TARGET}" - PARAMS+=";unwind_runtime_root=${OSX_ROOTS}/macOS/libunwind/${DEPLOYMENT_TARGET}" + PARAMS+=";dyld_library_path=${OSX_ROOTS}/macOS/${DEPLOYMENT_TARGET}" PARAMS+=";enable_assertions=True" generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Apple.cmake" \ @@ -536,16 +532,12 @@ # TODO: On Apple platforms, we never produce libc++abi.1.dylib or libunwind.1.dylib, # only libc++abi.dylib and libunwind.dylib. Fix that in the build so that the # tests stop searching for @rpath/libc++abi.1.dylib and @rpath/libunwind.1.dylib. - cp "${OSX_ROOTS}/macOS/libc++abi/${DEPLOYMENT_TARGET}/libc++abi.dylib" \ - "${OSX_ROOTS}/macOS/libc++abi/${DEPLOYMENT_TARGET}/libc++abi.1.dylib" - cp "${OSX_ROOTS}/macOS/libunwind/${DEPLOYMENT_TARGET}/libunwind.dylib" \ - "${OSX_ROOTS}/macOS/libunwind/${DEPLOYMENT_TARGET}/libunwind.1.dylib" + cp "${OSX_ROOTS}/macOS/${DEPLOYMENT_TARGET}/libc++abi.dylib" "${OSX_ROOTS}/macOS/${DEPLOYMENT_TARGET}/libc++abi.1.dylib" + cp "${OSX_ROOTS}/macOS/${DEPLOYMENT_TARGET}/libunwind.dylib" "${OSX_ROOTS}/macOS/${DEPLOYMENT_TARGET}/libunwind.1.dylib" arch="$(uname -m)" PARAMS="target_triple=${arch}-apple-macosx${DEPLOYMENT_TARGET}" - PARAMS+=";cxx_runtime_root=${OSX_ROOTS}/macOS/libc++/${DEPLOYMENT_TARGET}" - PARAMS+=";abi_runtime_root=${OSX_ROOTS}/macOS/libc++abi/${DEPLOYMENT_TARGET}" - PARAMS+=";unwind_runtime_root=${OSX_ROOTS}/macOS/libunwind/${DEPLOYMENT_TARGET}" + PARAMS+=";dyld_library_path=${OSX_ROOTS}/macOS/${DEPLOYMENT_TARGET}" generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Apple.cmake" \ -DLIBCXX_TEST_CONFIG="apple-libc++-backdeployment.cfg.in" \ diff --git a/libcxxabi/test/configs/apple-libc++abi-backdeployment.cfg.in b/libcxxabi/test/configs/apple-libc++abi-backdeployment.cfg.in --- a/libcxxabi/test/configs/apple-libc++abi-backdeployment.cfg.in +++ b/libcxxabi/test/configs/apple-libc++abi-backdeployment.cfg.in @@ -12,32 +12,14 @@ lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg') BACKDEPLOYMENT_PARAMETERS = [ - libcxx.test.dsl.Parameter(name='cxx_runtime_root', type=str, - actions=lambda root: [libcxx.test.dsl.AddSubstitution('%{cxx-runtime-root}', root)], + libcxx.test.dsl.Parameter(name='dyld_library_path', type=str, + actions=lambda path: [libcxx.test.dsl.AddSubstitution('%{dyld-library-path}', path)], help=""" - The simulated root of the system (for libc++) when running tests. + The simulated root of the system when running tests. - This should be a directory hierarchy under which the libc++ dylib can be found. - The dylib in that hierarchy is the one that will be used at runtime when running - the tests. - """), - libcxx.test.dsl.Parameter(name='abi_runtime_root', type=str, - actions=lambda root: [libcxx.test.dsl.AddSubstitution('%{abi-runtime-root}', root)], - help=""" - The simulated root of the system (for libc++abi) when running tests. - - This should be a directory hierarchy under which the libc++abi dylib can be found. - The dylib in that hierarchy is the one that will be used at runtime when running - the tests. - """), - libcxx.test.dsl.Parameter(name='unwind_runtime_root', type=str, - actions=lambda root: [libcxx.test.dsl.AddSubstitution('%{unwind-runtime-root}', root)], - help=""" - The simulated root of the system (for libunwind) when running tests. - - This should be a directory hierarchy under which the libunwind dylib can be found. - The dylib in that hierarchy is the one that will be used at runtime when running - the tests. + This should be a directory hierarchy under which the libc++, libc++abi and libunwind dylibs + can be found. The dylibs in that hierarchy are the one that will be used at runtime when + running the tests. """), ] @@ -52,7 +34,7 @@ '-nostdlib++ -L %{lib} -lc++ -lc++abi' )) config.substitutions.append(('%{exec}', - '%{executor} --execdir %T --env DYLD_LIBRARY_PATH="%{cxx-runtime-root}:%{abi-runtime-root}:%{unwind-runtime-root}" -- ' + '%{executor} --execdir %T --env DYLD_LIBRARY_PATH="%{dyld-library-path}" -- ' )) config.stdlib = 'apple-libc++' diff --git a/libunwind/test/configs/apple-libunwind-backdeployment.cfg.in b/libunwind/test/configs/apple-libunwind-backdeployment.cfg.in --- a/libunwind/test/configs/apple-libunwind-backdeployment.cfg.in +++ b/libunwind/test/configs/apple-libunwind-backdeployment.cfg.in @@ -12,32 +12,14 @@ lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg') BACKDEPLOYMENT_PARAMETERS = [ - libcxx.test.dsl.Parameter(name='cxx_runtime_root', type=str, - actions=lambda root: [libcxx.test.dsl.AddSubstitution('%{cxx-runtime-root}', root)], + libcxx.test.dsl.Parameter(name='dyld_library_path', type=str, + actions=lambda path: [libcxx.test.dsl.AddSubstitution('%{dyld-library-path}', path)], help=""" - The simulated root of the system (for libc++) when running tests. + The simulated root of the system when running tests. - This should be a directory hierarchy under which the libc++ dylib can be found. - The dylib in that hierarchy is the one that will be used at runtime when running - the tests. - """), - libcxx.test.dsl.Parameter(name='abi_runtime_root', type=str, - actions=lambda root: [libcxx.test.dsl.AddSubstitution('%{abi-runtime-root}', root)], - help=""" - The simulated root of the system (for libc++abi) when running tests. - - This should be a directory hierarchy under which the libc++abi dylib can be found. - The dylib in that hierarchy is the one that will be used at runtime when running - the tests. - """), - libcxx.test.dsl.Parameter(name='unwind_runtime_root', type=str, - actions=lambda root: [libcxx.test.dsl.AddSubstitution('%{unwind-runtime-root}', root)], - help=""" - The simulated root of the system (for libunwind) when running tests. - - This should be a directory hierarchy under which the libunwind dylib can be found. - The dylib in that hierarchy is the one that will be used at runtime when running - the tests. + This should be a directory hierarchy under which the libc++, libc++abi and libunwind dylibs + can be found. The dylibs in that hierarchy are the one that will be used at runtime when + running the tests. """), ] @@ -51,7 +33,7 @@ '-nostdlib++ -L %{lib} -lc++ -lc++abi -lunwind' )) config.substitutions.append(('%{exec}', - '%{executor} --execdir %T --env DYLD_LIBRARY_PATH="%{cxx-runtime-root}:%{abi-runtime-root}:%{unwind-runtime-root}" -- ' + '%{executor} --execdir %T --env DYLD_LIBRARY_PATH="%{dyld-library-path}" -- ' )) config.stdlib = 'apple-libc++'