media-libs/libjxl: wire up tests

These are CURRENTLY FAILING: libjxl/libjxl#2433 Bug: https://bugs.gentoo.org/908210 Closes: https://bugs.gentoo.org/907890 Signed-off-by: Matoro Mahri <matoro@users.noreply.github.com>
matoro · Jun 18, 2023 · 4874ecd · 4874ecd
1 parent e1c6847
commit 4874ecd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
@@ -2,3 +2,4 @@ DIST libjxl-0.7.0.tar.gz 1505917 BLAKE2B fd60e8fb1d7082deaaaf413395ac09e6096bb16
 DIST libjxl-0.7.0_pre20220825.tar.gz 1505499 BLAKE2B 67b1f33112c85c8ccf1187cc44441f1afd6b5f11139f5b066092abe3dd2304e7ff8a8179fb1ef2a08982d2700ac757113019580c99abf37b3d701310f70861bf SHA512 13132dbe93d1b55cf878653803b01547b77152687aedd8ea07c162562f78965f74b5d96b82a434d2982962ad817096253a9447743e620cc72af0f1906a284b1d
 DIST libjxl-0.8.0.tar.gz 1611824 BLAKE2B e16fb51c7938be22754cad70ccab1e0e965b218993aa2fe9646b6b8958887b2e868bdc9631a9d3ff5c24ca1b02f9e262c4d531238d78a7d80f23ed5911a95b1e SHA512 ef472ddc5e277f3d41491c2acc03ed0152ec3ea87efb9e3320cfd830ceb383728658318444b06a3e9f8662bc11c0014675966572ce33f49c8e5cb13c5ed48de1
 DIST libjxl-0.8.1.tar.gz 1611905 BLAKE2B 75d7b4987c211e747520688a700744a0996483546b5929e8b765a66fc603b4d6edea8556bb427b8c7440ef447161fc38ef5ea390775f185df577da920711a009 SHA512 8011f2181cb627c2b516c7e1b8ecec78a201f357f3be6e568f7814a6a9c42d5979f4bb4ed040a67d68f6649d1f5c564f3cb2fac7e52702f755749084d903a737
+DIST libjxl-testdata-d6168ffb9e1cc24007e64b65dd84d822ad1fc759.tar.gz 67553075 BLAKE2B 779fee87386e617edd93bca7a523fa1ab223ae88114c3cc5484987a7c92cca2d0bb3d668fa3c8064b2a0255c17a06447c009f4fbf9ef379692ddfa37dee1be97 SHA512 a48d74a1ccff404eb7675225b59965e056dc3fc09930572785d83bae03fa1c38e105336dbf5ecfc3f0995e8b8bfb1097b451ae661f2933590b2b152192c8aa2f
diff --git a/media-libs/libjxl/libjxl-0.8.1.ebuild b/media-libs/libjxl/libjxl-0.8.1.ebuild
@@ -5,14 +5,19 @@ EAPI=8
 
 inherit cmake-multilib flag-o-matic
 
+# This changes frequently.  Please check the testdata submodule when bumping.
+TESTDATA_COMMIT="d6168ffb9e1cc24007e64b65dd84d822ad1fc759"
 DESCRIPTION="JPEG XL image format reference implementation"
 HOMEPAGE="https://github.com/libjxl/libjxl"
-SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/libjxl/testdata/archive/${TESTDATA_COMMIT}.tar.gz
+		-> ${PN}-testdata-${TESTDATA_COMMIT}.tar.gz )"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="openexr"
+IUSE="openexr test"
+RESTRICT="!test? ( test )"
 
 DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
 	>=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}]
@@ -22,14 +27,15 @@ DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:=[${MULTILIB_USEDEP}]
 	>=x11-misc/shared-mime-info-2.2
 	openexr? ( media-libs/openexr:= )
+	test? ( dev-cpp/gtest )
 "
 RDEPEND="${DEPEND}"
 
 multilib_src_configure() {
 	filter-lto
 
 	local mycmakeargs=(
-		-DBUILD_TESTING=OFF
+		-DJPEGXL_TEST_DATA_PATH="${WORKDIR}/testdata-${TESTDATA_COMMIT}"
 		-DJPEGXL_ENABLE_BENCHMARK=OFF
 		-DJPEGXL_ENABLE_COVERAGE=OFF
 		-DJPEGXL_ENABLE_FUZZERS=OFF
@@ -40,6 +46,7 @@ multilib_src_configure() {
 		-DJPEGXL_ENABLE_VIEWERS=OFF
 		-DJPEGXL_ENABLE_PLUGINS=OFF
 		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+		-DJPEGXL_FORCE_SYSTEM_GTEST=ON
 		-DJPEGXL_FORCE_SYSTEM_HWY=ON
 		-DJPEGXL_FORCE_SYSTEM_LCMS2=ON
 		-DJPEGXL_ENABLE_DOXYGEN=OFF
@@ -54,11 +61,13 @@ multilib_src_configure() {
 		mycmakeargs+=(
 			-DJPEGXL_ENABLE_TOOLS=ON
 			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
+			-DBUILD_TESTING=$(usex test ON OFF)
 		)
 	else
 		mycmakeargs+=(
 			-DJPEGXL_ENABLE_TOOLS=OFF
 			-DJPEGXL_ENABLE_OPENEXR=OFF
+			-DBUILD_TESTING=OFF
 		)
 	fi
 

diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="JPEG XL image format reference implementation"
 HOMEPAGE="https://github.com/libjxl/libjxl"
 
 EGIT_REPO_URI="https://github.com/libjxl/libjxl.git"
-EGIT_SUBMODULES=(third_party/skcms)
+EGIT_SUBMODULES=(testdata third_party/skcms)
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="gdk-pixbuf openexr"
+IUSE="gdk-pixbuf openexr test"
+RESTRICT="!test? ( test )"
 
 DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
 	>=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}]
@@ -26,14 +27,14 @@ DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
 		x11-libs/gdk-pixbuf:2
 	)
 	openexr? ( media-libs/openexr:= )
+	test? ( dev-cpp/gtest )
 "
 RDEPEND="${DEPEND}"
 
 multilib_src_configure() {
 	filter-lto
 
 	local mycmakeargs=(
-		-DBUILD_TESTING=OFF
 		-DJPEGXL_ENABLE_BENCHMARK=OFF
 		-DJPEGXL_ENABLE_COVERAGE=OFF
 		-DJPEGXL_ENABLE_FUZZERS=OFF
@@ -43,6 +44,7 @@ multilib_src_configure() {
 		-DJPEGXL_ENABLE_SKCMS=ON
 		-DJPEGXL_ENABLE_VIEWERS=OFF
 		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+		-DJPEGXL_FORCE_SYSTEM_GTEST=ON
 		-DJPEGXL_FORCE_SYSTEM_HWY=ON
 		-DJPEGXL_ENABLE_DOXYGEN=OFF
 		-DJPEGXL_ENABLE_MANPAGES=OFF
@@ -60,12 +62,14 @@ multilib_src_configure() {
 			-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf)
 			-DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF
 			-DJPEGXL_ENABLE_PLUGIN_MIME=OFF
+			-DBUILD_TESTING=$(usex test ON OFF)
 		)
 	else
 		mycmakeargs+=(
 			-DJPEGXL_ENABLE_TOOLS=OFF
 			-DJPEGXL_ENABLE_OPENEXR=OFF
 			-DJPEGXL_ENABLE_PLUGINS=OFF
+			-DBUILD_TESTING=OFF
 		)
 	fi