dev-util/hip: fix tests and dependency on hipcc, bump to 6.0.2

1. Correct test SRC_URI
2. Update rocm_agent_enumerator-location.patch to
   hipcc-system-install.patch
3. dev-util/hipcc does not provide libraries to be linked in, so should
   not be in DEPEND, just RDEPEND; it is used as a compiler wrapper if
   building test binaries, thus should be in BDEPEND if test enabled.
4. Remove unused BUILD_HIPIFY_CLANG
5. Specify CMAKE_MODULE_PATH to prefer bundled catch (which includes
   commands designed for hip)

Signed-off-by: Yiyang Wu <xgreenlandforwyy@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>

5 files changed, 102 insertions, 32 deletions

diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
index 98d00a1edc40..bdccb9c69e6d 100644
--- a/dev-util/hip/Manifest
+++ b/dev-util/hip/Manifest
@@ -1,13 +1,14 @@
 DIST hip-5.1.3-update-header.patch.gz 3406 BLAKE2B 805539c3396a9cdcc4b807afd96eacd2de0e494a9ec927a1526cb8ce26b1c6e0a4d06415cd0210cba1398b5ff70f995fa67ad22b659578c075eb24c2a2cc9228 SHA512 eef4d70f9470a61d1d8cb140728cc4f2e792a4e64e0900a7410a74f3a6421410e7546e4e62bbbf35ae231b566bf162fb85de1f1ad1d8cfb2f282d2ed9a34b53a
 DIST hip-5.7.1.tar.gz 553774 BLAKE2B f88c235f688d3a662ec6cb4ad7fe3f82c0015015997871609cc30ab5b2f7fcb9709a08683d77194e45a6dbbe1d24c6355b128d2ecf655f1dea3468711c64e0a3 SHA512 68fa8753725b53c999d102d254c6b1dba53af4e00d6a48db93d10213cc02eec30b4a39c66e773d4f625dd9636cf8b0c5faa05b69fac27cf5a6b19dd3ddd2b905
-DIST hip-6.0.0.tar.gz 243451 BLAKE2B c404d23f7ee46a6c5601077d598edf4d6b2ca48da5e6cabf45c926ee1224eedc3d9eb6715948bc44cf3da2431a2feb879b1b8cd35bac69319c9dc066ab2e12f7 SHA512 2beb100812f9f515d6bc29fd4930913c2ff64c4f824727c9fc38d2e249841c840bd35357f652ab2b5022d166331de8f7409e72c49a5f69042f54f16a6a290339
+DIST hip-6.0.2.tar.gz 243457 BLAKE2B 72bc03b8e4098a8d454dd17293dc6942534707f57f08db7ebf1f7653549cb13ec2971c1b329b6cea3df3c2c48bbdb4fbbb014cbeb27a39c07a4489797801ab1b SHA512 8e040220eb95b219819312e021f678ad4e1addc45f87d484fc40bdec1b5532976aad4b4aa9ec2cab45374f4802453d4d7fdbc7bcd4d9adc17cb820be406e3c43
+DIST hip-test-6.0.2.tar.gz 959429 BLAKE2B f2167b00fc69a0ba6a03080e82cb1ff02120c3910b1eca6d623b9d3e3bc27b067c3f266ca0e633d83b60275bdfa42c3ad936e6481e4e5727c912ec702c246055 SHA512 7696298864d39729831edae2bc2ec55f2c8b3bc7578861b022f77a6d4e55a141bcb0bd83e3912c54b5c4cd745654019c75eb542ef6d260a1946a55d1abe42243
 DIST rocclr-5.1.3.tar.gz 618606 BLAKE2B 02b7732ddd03c0883bee49c56466cd21c649159f801bfb2537eea6e640c65613eb57b37d942f465a9deb83d65735f51212dde5e4f77ba8239d1a6b7037e1800c SHA512 89fd2eca39ed84a1cf525b2c606089ef39f64c1f997c4880e10722da6de4864110752640e1508db1aeb9d15c48ba4e6fe5dbe7a9e56718853ece42548028b2ca
 DIST rocclr-5.3.3.tar.gz 625944 BLAKE2B 0cdbc1415a355e1d56628834846aaa8587c9827eeea59f4312b788e868265dcb42197181fd5ef411416da2e11662c7f665f578aa750ab88c3a5405bcc58ee449 SHA512 3f85532cffc09c2ca8e7cd1770263d1c1a38633ed2bc5cfe62072e12a6f8f669db400519950718be31f6b77693d372e2ef905f06c7f02e126aa9ff7d2da97924
 DIST rocclr-5.4.3.tar.gz 640557 BLAKE2B 9ab91bab7ffb06c9c0d1c2ae79533fccc597071dda289ac375e32eb2965c638a7029951d2a49d46eeead9d7d242fe3a0cedb3e444d877af1bbf0e2d801c91e11 SHA512 c1d1a2ca08c2d762a221c04d394469aa7aff46086151333b145e0db9a7c7eb3dbbf8b9693e50d816aa9a13c16b4ebacf5ff3d5d8ff3393a8a764728ef5172d3a
 DIST rocclr-5.5.1.tar.gz 634330 BLAKE2B e6383a6b6b09f274a944d66effd345e38a191ec73ee5c5240f8ec8bb62a4df97b80835ce57f8f78c3834602b9da425b49289b5c7cd7e4c7071147ff409c6a6c9 SHA512 4c12011d22a4f14d9e93250b2a38716eb973139afa1adbbbd51c0e0ed13c0b7c1f45a37c71ef937c5fdabf09e928d7913ca3332fc61b7a2c10d21421306a228f
 DIST rocm-5.7.0.tar.gz 845881 BLAKE2B 08255edc1407e5ef85895336b11496319695318fce265565728ad75175b5e1dfab98f696fee2d27e60c48e862f721fad4c53118cc70b807353fff5f97ed72ac2 SHA512 72420e16c7cfe9687e030331838666dabaa43d686bdad1d109431e44db99070a2cf6dd64b59e3275019abedd6612f6008c798a79275e7225b6b122fb9f644660
 DIST rocm-clr-5.7.1.tar.gz 2008647 BLAKE2B 3db0760d6f83504e60caf88a2dd5e0bc02c7db9d6f263ad0eb2cfc79aa0f88a3699c412844a0158a796d9d02e79660287e791edad787d814eefffea4fd2298b4 SHA512 d79323481d82fc02c12a32cdcc0d14437d512af023e7737db0387b7eecb27fe6e4ae7c71d6adce57932a04bb24c880440d9dc10aeb5af11a4f2ca64d44330965
-DIST rocm-clr-6.0.0.tar.gz 1983453 BLAKE2B 2cf6ec7c3b0ec5dedeea94ff54af30662b781fc2eee22e3315094af61dc9d331eba33c1d9d463295848c5724e515a3137f9b189c1261273afad1a5f9d32226c2 SHA512 12e77a121150d8c25121b98bd7c6233c2568f9f4130bdbe6bc3ab225f14b8bea6a6bdc4ed497c0f999d3d3daabdca0de8caaa1b69911c11974b5d6f951734433
+DIST rocm-clr-6.0.2.tar.gz 1983571 BLAKE2B 968bcff00bcf045ad872548bfdafbbd8e4088f4e903dfa1266cbb4627d1af87cbbc9b2bdc6f6842c60d8ea6060e86eb6eb597f7673b82a63992cfcb3fc84bf59 SHA512 f7acc8dabaa11ccb3e2ff2547929276476bdbbf66051ce2e93795921cab7211ff8a70d9da3431d54ea9d45c9d31ff39e9036f363230f782dd1b0e1e3473e0512
 DIST rocm-hip-5.1.3.tar.gz 967696 BLAKE2B 15cb52b5934b84acf515fe9c83b7c8982e00a23e20af933bdd2c4bc5b56fd42b08c8a08e840c85d2e0a8386d5a0e9c110504f68499989de1aaad00e9a5efcf43 SHA512 6b6fd6c12d73788df1711b12326b97fc7a184f319e0db114947b7967b75f2ee131f81e42e43a4981456b507221a6013133731120409f90214e13304299ccbc24
 DIST rocm-hip-5.3.3.tar.gz 1151858 BLAKE2B 5f460b2078c850b3eb4414fcec4a6f951a3b282aa9828f77ba5d5adfdc0ee8d2e62c856e112a154c340daaf7dad49f4871412edd7b38f7fae2e6b17840ee144b SHA512 e747cc10e78cd09009cac762f0e060be13f3447af7ec2a4a2889cbdc09cd76ecb1b5b58c89f09a3b45a8296c2c71e1c55baf113e58a5a12434af3de7168b8d87
 DIST rocm-hip-5.4.3.tar.gz 1195173 BLAKE2B 7452ee7a874bc4703b0d3aaaf9fa2a51e223d5650c65c34982a9981dbe14e8ec70c93d7e70c5ad36a8d02c3d2214fa6a393e20502a01418fb3320d8cfe363feb SHA512 1f4100e114576dcbad83aae453e21ab85cf25bd8a6ada380bb11cfc30e5f92ba903055b7257a099321a84b65adb444dd52b8258e82567f4bc882e65d89369b43
diff --git a/dev-util/hip/files/hip-6.0.2-install.patch b/dev-util/hip/files/hip-6.0.2-install.patch
new file mode 100644
index 000000000000..e2fc3a8852cb
--- /dev/null
+++ b/dev-util/hip/files/hip-6.0.2-install.patch
@@ -0,0 +1,23 @@
+diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt
+index 7ad30019d..e79ea0714 100755
+--- a/hipamd/CMakeLists.txt
++++ b/hipamd/CMakeLists.txt
+@@ -398,18 +398,7 @@ if (NOT ${HIPCC_BIN_DIR} STREQUAL "")
+       set(hipcc_bin ${hipcc_bin}.exe)
+       set(hipconfig_bin ${hipconfig_bin}.exe)
+     endif()
+-    if(EXISTS ${hipcc_bin} AND EXISTS ${hipconfig_bin})
+-      install(PROGRAMS ${hipcc_bin} DESTINATION bin)
+-      install(PROGRAMS ${hipconfig_bin} DESTINATION bin)
+-    endif()
+   endif()
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc DESTINATION bin)
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig DESTINATION bin)
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.pl DESTINATION bin)
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.pl DESTINATION bin)
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipvars.pm DESTINATION bin)
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin)
+-  install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin)
+ endif()
+ 
+ #############################
diff --git a/dev-util/hip/files/hip-test-6.0.2-hipcc-system-install.patch b/dev-util/hip/files/hip-test-6.0.2-hipcc-system-install.patch
new file mode 100644
index 000000000000..bf143939d13e
--- /dev/null
+++ b/dev-util/hip/files/hip-test-6.0.2-hipcc-system-install.patch
@@ -0,0 +1,43 @@
+In Gentoo rocm_agent_enumerator is installed by rocminfo and is in PATH.
+
+Index: catch/CMakeLists.txt
+===================================================================
+--- catch.orig/CMakeLists.txt
++++ catch/CMakeLists.txt
+@@ -55,9 +55,9 @@ endif()
+ message(STATUS "HIP_PATH: ${HIP_PATH}")
+ message(STATUS "ROCM_PATH: ${ROCM_PATH}")
+ 
+-set(CMAKE_CXX_COMPILER "${HIP_PATH}/bin/hipcc${EXT}")
+-set(CMAKE_C_COMPILER "${HIP_PATH}/bin/hipcc${EXT}")
+-set(HIPCONFIG_EXECUTABLE "${HIP_PATH}/bin/hipconfig${EXT}")
++set(CMAKE_CXX_COMPILER "hipcc${EXT}")
++set(CMAKE_C_COMPILER "hipcc${EXT}")
++set(HIPCONFIG_EXECUTABLE "hipconfig${EXT}")
+ execute_process(COMMAND ${HIPCONFIG_EXECUTABLE} --version
+                 OUTPUT_VARIABLE HIP_VERSION
+                 OUTPUT_STRIP_TRAILING_WHITESPACE)
+@@ -183,9 +183,8 @@ message(STATUS "CMAKE HIP ARCHITECTURES:
+ # OFFLOAD_ARCH_STR
+ # rocm_agent_enumerator
+ if(NOT DEFINED OFFLOAD_ARCH_STR
+-   AND EXISTS "${ROCM_PATH}/bin/rocm_agent_enumerator"
+    AND HIP_PLATFORM STREQUAL "amd" AND UNIX)
+-    execute_process(COMMAND "${ROCM_PATH}/bin/rocm_agent_enumerator"
++    execute_process(COMMAND "rocm_agent_enumerator"
+          OUTPUT_VARIABLE HIP_GPU_ARCH
+          RESULT_VARIABLE ROCM_AGENT_ENUM_RESULT
+          OUTPUT_STRIP_TRAILING_WHITESPACE)
+Index: catch/hipTestMain/hip_test_context.cc
+===================================================================
+--- catch.orig/hipTestMain/hip_test_context.cc
++++ catch/hipTestMain/hip_test_context.cc
+@@ -37,7 +37,7 @@ std::string TestContext::substringFound(
+ 
+ std::string TestContext::getCurrentArch() {
+ #if HT_LINUX
+-  const char* cmd = "/opt/rocm/bin/rocm_agent_enumerator | sort -u | xargs | sed -e 's/ /;/g'";
++  const char* cmd = "rocm_agent_enumerator | sort -u | xargs | sed -e 's/ /;/g'";
+   std::array<char, 1024> buffer;
+   std::string result;
+   std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd, "r"), pclose);
diff --git a/dev-util/hip/hip-5.7.1-r2.ebuild b/dev-util/hip/hip-5.7.1-r2.ebuild
index c6c7376c0297..071f9253fb5c 100644
--- a/dev-util/hip/hip-5.7.1-r2.ebuild
+++ b/dev-util/hip/hip-5.7.1-r2.ebuild
@@ -7,17 +7,17 @@ DOCS_BUILDER="doxygen"
 DOCS_DEPEND="media-gfx/graphviz"
 ROCM_SKIP_GLOBALS=1
 
-inherit cmake docs llvm rocm flag-o-matic
+inherit cmake docs flag-o-matic llvm rocm
 
 LLVM_MAX_SLOT=17
 
 TEST_PV=5.7.0 # No hip-test-5.7.1 release
 
 DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipamd"
-SRC_URI="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz
-	https://github.com/ROCm-Developer-Tools/HIP/archive/refs/tags/rocm-${PV}.tar.gz -> hip-${PV}.tar.gz
-	test? ( https://github.com/ROCm-Developer-Tools/hip-tests/archive/refs/tags/rocm-${TEST_PV}.tar.gz )"
+HOMEPAGE="https://github.com/ROCm/hipamd"
+SRC_URI="https://github.com/ROCm/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz
+	https://github.com/ROCm/HIP/archive/refs/tags/rocm-${PV}.tar.gz -> hip-${PV}.tar.gz
+	test? ( https://github.com/ROCm/hip-tests/archive/refs/tags/rocm-${TEST_PV}.tar.gz )"
 
 KEYWORDS="~amd64"
 LICENSE="MIT"
@@ -27,7 +27,6 @@ RESTRICT="!test? ( test )"
 IUSE="debug test"
 
 DEPEND="
-	dev-util/hipcc
 	>=dev-util/rocminfo-5
 	sys-devel/clang:${LLVM_MAX_SLOT}
 	dev-libs/rocm-comgr:${SLOT}
@@ -35,7 +34,9 @@ DEPEND="
 	x11-base/xorg-proto
 	virtual/opengl
 "
+BDEPEND="test? ( <dev-util/hipcc-6 )"
 RDEPEND="${DEPEND}
+	dev-util/hipcc
 	dev-perl/URI-Encode
 	sys-devel/clang-runtime:=
 	>=dev-libs/roct-thunk-interface-5"
@@ -51,12 +52,12 @@ PATCHES=(
 )
 
 S="${WORKDIR}/clr-rocm-${PV}/"
+TEST_S="${WORKDIR}/hip-tests-rocm-${TEST_PV}/catch"
 
 hip_test_wrapper() {
-	local S="${WORKDIR}/hip-tests-rocm-${TEST_PV}/catch"
-	local CMAKE_USE_DIR="${S}"
-	local BUILD_DIR="${S}_build"
-	cd "${S}" || die
+	local CMAKE_USE_DIR="${TEST_S}"
+	local BUILD_DIR="${TEST_S}_build"
+	cd "${TEST_S}" || die
 	$@
 }
 
@@ -66,8 +67,8 @@ src_prepare() {
 		-e "s:#Set HIP_CLANG_PATH:set(HIP_CLANG_PATH \"$(get_llvm_prefix -d ${LLVM_MAX_SLOT})/bin\"):" \
 	    -i "${WORKDIR}"/HIP-rocm-${PV}/cmake/FindHIP.cmake || die
 
-	# https://github.com/ROCm-Developer-Tools/HIP/commit/405d029422ba8bb6be5a233d5eebedd2ad2e8bd3
-	# https://github.com/ROCm-Developer-Tools/clr/commit/ab6d34ae773f4d151e04170c0f4e46c1135ddf3e
+	# https://github.com/ROCm/HIP/commit/405d029422ba8bb6be5a233d5eebedd2ad2e8bd3
+	# https://github.com/ROCm/clr/commit/ab6d34ae773f4d151e04170c0f4e46c1135ddf3e
 	# Migrated to hip-test, but somehow the change is not applied to the tarball.
 	rm -rf "${WORKDIR}"/HIP-rocm-${PV}/tests || die
 	sed -e '/tests.*cmake/d' -i hipamd/CMakeLists.txt || die
@@ -115,6 +116,7 @@ src_configure() {
 		local mycmakeargs=(
 			-DROCM_PATH="${BUILD_DIR}"/hipamd
 			-DHIP_PLATFORM=amd
+			-DCMAKE_MODULE_PATH="${TEST_S}/external/Catch2/cmake/Catch2"
 		)
 		hip_test_wrapper cmake_src_configure
 	fi
@@ -167,7 +169,7 @@ EOF
 
 	rm "${ED}/usr/include/hip/hcc_detail" || die
 
-	# files already installed by hipcc, which is a build dep
+	# files already installed by hipcc, which is a runtime dep
 	rm "${ED}/usr/bin/hipconfig.pl" || die
 	rm "${ED}/usr/bin/hipcc.pl" || die
 	rm "${ED}/usr/bin/hipcc" || die
diff --git a/dev-util/hip/hip-6.0.0.ebuild b/dev-util/hip/hip-6.0.2.ebuild
index ff53e07dc49a..48c0a89a0801 100644
--- a/dev-util/hip/hip-6.0.0.ebuild
+++ b/dev-util/hip/hip-6.0.2.ebuild
@@ -11,13 +11,13 @@ inherit cmake docs flag-o-matic llvm rocm
 
 LLVM_MAX_SLOT=17
 
-TEST_PV=5.7.0 # No hip-test-5.7.1 release
+TEST_PV=${PV}
 
 DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipamd"
-SRC_URI="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz
-	https://github.com/ROCm-Developer-Tools/HIP/archive/refs/tags/rocm-${PV}.tar.gz -> hip-${PV}.tar.gz
-	test? ( https://github.com/ROCm-Developer-Tools/hip-tests/archive/refs/tags/rocm-${TEST_PV}.tar.gz )"
+HOMEPAGE="https://github.com/ROCm/hipamd"
+SRC_URI="https://github.com/ROCm/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz
+	https://github.com/ROCm/HIP/archive/refs/tags/rocm-${PV}.tar.gz -> hip-${PV}.tar.gz
+	test? ( https://github.com/ROCm/hip-tests/archive/refs/tags/rocm-${TEST_PV}.tar.gz -> hip-test-${TEST_PV}.tar.gz )"
 
 KEYWORDS="~amd64"
 LICENSE="MIT"
@@ -27,7 +27,6 @@ RESTRICT="!test? ( test )"
 IUSE="debug test"
 
 DEPEND="
-	dev-util/hipcc
 	>=dev-util/rocminfo-5
 	sys-devel/clang:${LLVM_MAX_SLOT}
 	dev-libs/rocm-comgr:${SLOT}
@@ -35,13 +34,15 @@ DEPEND="
 	x11-base/xorg-proto
 	virtual/opengl
 "
+BDEPEND="test? ( dev-util/hipcc )"
 RDEPEND="${DEPEND}
+	dev-util/hipcc
 	dev-perl/URI-Encode
 	sys-devel/clang-runtime:=
 	>=dev-libs/roct-thunk-interface-5"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.7.0-install.patch"
+	"${FILESDIR}/${PN}-6.0.2-install.patch"
 	"${FILESDIR}/${PN}-5.7.1-fix-unaligned-access.patch"
 	"${FILESDIR}/${PN}-5.7.1-exec-stack.patch"
 	"${FILESDIR}/${PN}-5.7.1-disable-stack-protector.patch"
@@ -50,12 +51,12 @@ PATCHES=(
 )
 
 S="${WORKDIR}/clr-rocm-${PV}/"
+TEST_S="${WORKDIR}/hip-tests-rocm-${TEST_PV}/catch"
 
 hip_test_wrapper() {
-	local S="${WORKDIR}/hip-tests-rocm-${TEST_PV}/catch"
-	local CMAKE_USE_DIR="${S}"
-	local BUILD_DIR="${S}_build"
-	cd "${S}" || die
+	local CMAKE_USE_DIR="${TEST_S}"
+	local BUILD_DIR="${TEST_S}_build"
+	cd "${TEST_S}" || die
 	$@
 }
 
@@ -64,8 +65,8 @@ src_prepare() {
 	# FindHIP.cmake module.
 	rm -r "${WORKDIR}"/HIP-rocm-${PV}/cmake/FindHIP* || die
 
-	# https://github.com/ROCm-Developer-Tools/HIP/commit/405d029422ba8bb6be5a233d5eebedd2ad2e8bd3
-	# https://github.com/ROCm-Developer-Tools/clr/commit/ab6d34ae773f4d151e04170c0f4e46c1135ddf3e
+	# https://github.com/ROCm/HIP/commit/405d029422ba8bb6be5a233d5eebedd2ad2e8bd3
+	# https://github.com/ROCm/clr/commit/ab6d34ae773f4d151e04170c0f4e46c1135ddf3e
 	# Migrated to hip-test, but somehow the change is not applied to the tarball.
 	rm -rf "${WORKDIR}"/HIP-rocm-${PV}/tests || die
 	sed -e '/tests.*cmake/d' -i hipamd/CMakeLists.txt || die
@@ -73,7 +74,7 @@ src_prepare() {
 	cmake_src_prepare
 
 	if use test; then
-		PATCHES=${FILESDIR}/hip-test-5.7.0-rocm_agent_enumerator-location.patch \
+		PATCHES="${FILESDIR}"/hip-test-6.0.2-hipcc-system-install.patch \
 			   hip_test_wrapper cmake_src_prepare
 	fi
 }
@@ -97,7 +98,6 @@ src_configure() {
 		-DCMAKE_PREFIX_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
 		-DCMAKE_BUILD_TYPE=${buildtype}
 		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_HIPIFY_CLANG=OFF
 		-DHIP_PLATFORM=amd
 		-DHIP_COMMON_DIR="${WORKDIR}/HIP-rocm-${PV}"
 		-DROCM_PATH="${EPREFIX}/usr"
@@ -114,8 +114,9 @@ src_configure() {
 		local mycmakeargs=(
 			-DROCM_PATH="${BUILD_DIR}"/hipamd
 			-DHIP_PLATFORM=amd
+			-DCMAKE_MODULE_PATH="${TEST_S}/external/Catch2/cmake/Catch2"
 		)
-		hip_test_wrapper cmake_src_configure
+		HIP_PATH="${EPREFIX}/usr" hip_test_wrapper cmake_src_configure
 	fi
 }
 
@@ -153,7 +154,7 @@ src_test() {
 src_install() {
 	cmake_src_install
 
-	# files already installed by hipcc, which is a build dep
+	# files already installed by hipcc, which is a runtime dep
 	rm "${ED}/usr/bin/hipconfig.pl" || die
 	rm "${ED}/usr/bin/hipcc.pl" || die
 	rm "${ED}/usr/bin/hipcc" || die