[gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt/

[Michał Górny]

commit:     49e7e58000978a0b3a78248c6f5095a79b63fd7a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 14:33:29 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 08:14:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49e7e580

sys-libs/compiler-rt: Switch builtin tests to lit

Replace the custom builtin test logic with lit, now that upstream
supports running builtin tests using it.

 sys-libs/compiler-rt/compiler-rt-9999.ebuild | 78 ++++++----------------------
 1 file changed, 16 insertions(+), 62 deletions(-)

diff --git a/sys-libs/compiler-rt/compiler-rt-9999.ebuild b/sys-libs/compiler-rt/compiler-rt-9999.ebuild
index 7431230cf57..1f6cc5955c3 100644
--- a/sys-libs/compiler-rt/compiler-rt-9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-9999.ebuild
@@ -8,7 +8,6 @@ EAPI=6
 CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python2_7 )
 
-# TODO: fix unnecessary dep on Python upstream
 inherit cmake-utils flag-o-matic git-r3 llvm python-any-r1 toolchain-funcs
 
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
@@ -28,7 +27,9 @@ LLVM_SLOT=${SLOT%%.*}
 DEPEND="
 	>=sys-devel/llvm-4
 	clang? ( sys-devel/clang )
-	test? ( =sys-devel/clang-${PV%_*}*:${LLVM_SLOT} )
+	test? (
+		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${LLVM_SLOT} )
 	${PYTHON_DEPS}"
 
 # least intrusive of all
@@ -64,74 +65,27 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
 
-		# currently lit covers only sanitizer tests
-		-DCOMPILER_RT_INCLUDE_TESTS=OFF
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
 		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
 		-DCOMPILER_RT_BUILD_XRAY=OFF
 	)
 
+	if use test; then
+		mycmakeargs+=(
+			-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
+
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang++"
+		)
+	fi
+
 	cmake-utils_src_configure
 }
 
 src_test() {
-	# prepare a test compiler
-	# copy clang over since resource_dir is located relatively to binary
-	# therefore, we can put our new libraries in it
-	mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_SLOT}{/bin,$(get_libdir)},clang/${SLOT}/include} || die
-	cp "${EPREFIX}"/usr/lib/llvm/${LLVM_SLOT}/bin/clang{,++} \
-		"${BUILD_DIR}"/lib/llvm/${LLVM_SLOT}/bin/ || die
-	cp "${EPREFIX}/usr/lib/clang/${SLOT}/include"/*.h \
-		"${BUILD_DIR}/lib/clang/${SLOT}/include/" || die
-
-	# builtins are not converted to lit yet, so run them manually
-	local tests=() f
-	cd "${S}"/test/builtins/Unit || die
-	while read -r -d '' f; do
-		# ppc subdir is unmaintained and lacks proper guards
-		# (and ppc builtins do not seem to be used anyway)
-		[[ ${f} == ./ppc/* ]] && continue
-		# these are special
-		[[ ${f} == ./cpu_model_test.c ]] && continue
-		[[ ${f} == ./gcc_personality_test.c ]] && continue
-		# unsupported
-		[[ ${f} == ./trampoline_setup_test.c ]] && continue
-		tests+=( "${f%.c}" )
-	done < <(find -name '*.c' -print0)
-
-	{
-		echo "check: ${tests[*]/#/check-}" &&
-		echo ".PHONY: check ${tests[*]/#/check-}" &&
-		for f in "${tests[@]}"; do
-			echo "check-${f}: ${f}" &&
-			echo "	${f}"
-		done
-	} > Makefile || die
-
-	local ABI
-	for ABI in $(get_all_abis); do
-		# not supported at all at the moment
-		[[ ${ABI} == x32 ]] && continue
-
-		rm -f "${tests[@]}" || die
-
-		einfo "Running tests for ABI=${ABI}"
-		# use -k to run all tests even if some fail
-		emake -k \
-			CC="${BUILD_DIR}/lib/llvm/${LLVM_SLOT}/bin/clang" \
-			CFLAGS="$(get_abi_CFLAGS)" \
-			CPPFLAGS='-I../../../lib/builtins' \
-			LDFLAGS='-rtlib=compiler-rt' \
-			LDLIBS='-lm'
-	done
-}
-
-src_install() {
-	cmake-utils_src_install
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
 
-	# includes are mistakenly installed for all sanitizers and xray
-	rm -rf "${ED}"usr/lib/clang/*/include || die
+	cmake-utils_src_make check-builtins
 }