sys-libs/compiler-rt-sanitizers: Use app-portage/unsandbox for tests

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
index 9b280fd0ba34d6de51589f10f6bbbc8a8860ad16..c83df17c1d71416a57be9f738a996e8854505ca3 100644 (file)
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
@@ -25,7 +25,9 @@ RDEPEND="${PYTHON_DEPS}
        !<sys-devel/llvm-${PV}"
 DEPEND="${RDEPEND}
        ~sys-devel/llvm-${PV}
-       test? ( dev-python/lit[${PYTHON_USEDEP}]
+       test? (
+               app-portage/unsandbox
+               dev-python/lit[${PYTHON_USEDEP}]
                ~sys-devel/clang-${PV}
                ~sys-libs/compiler-rt-${PV} )
        ${PYTHON_DEPS}"
@@ -70,7 +72,7 @@ src_configure() {
        if use test; then
                mycmakeargs+=(
                        -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-                       -DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
+                       -DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit"
 
                        # they are created during src_test()
                        -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/bin/clang"
@@ -102,9 +104,6 @@ src_configure() {
 }
 
 src_test() {
-       # sandbox breaks libasan tests... and is hard to kill
-       # so abuse the fail in its algorithms
-       local -x LD_PRELOAD=${LD_PRELOAD/libsandbox/nolibsandbox}
        # respect TMPDIR!
        local -x LIT_PRESERVES_TMP=1