diff --git a/catch/include/memcpy1d_tests_common.hh b/catch/include/memcpy1d_tests_common.hh index ec8f991fa7..7eae09ab8b 100644 --- a/catch/include/memcpy1d_tests_common.hh +++ b/catch/include/memcpy1d_tests_common.hh @@ -141,7 +141,9 @@ void MemcpyDeviceToDeviceShell(F memcpy_func, const hipStream_t kernel_stream = int can_access_peer = 0; HIP_CHECK(hipDeviceCanAccessPeer(&can_access_peer, src_device, dst_device)); if (!can_access_peer) { - INFO("Peer access cannot be enabled between devices " << src_device << " " << dst_device); + std::string msg = "Skipped as peer access cannot be enabled between devices " + + std::to_string(src_device) + " " + std::to_string(dst_device); + HipTest::HIP_SKIP_TEST(msg.c_str()); return; } HIP_CHECK(hipDeviceEnablePeerAccess(dst_device, 0)); diff --git a/catch/unit/memory/memcpy2d_tests_common.hh b/catch/unit/memory/memcpy2d_tests_common.hh index 40e774da68..96f9a16e80 100644 --- a/catch/unit/memory/memcpy2d_tests_common.hh +++ b/catch/unit/memory/memcpy2d_tests_common.hh @@ -81,8 +81,10 @@ void Memcpy2DDeviceToDeviceShell(F memcpy_func, const hipStream_t kernel_stream int can_access_peer = 0; HIP_CHECK(hipDeviceCanAccessPeer(&can_access_peer, src_device, dst_device)); if (!can_access_peer) { - INFO("Peer access cannot be enabled between devices " << src_device << " " << dst_device); - REQUIRE(can_access_peer); + std::string msg = "Skipped as peer access cannot be enabled between devices " + + std::to_string(src_device) + " " + std::to_string(dst_device); + HipTest::HIP_SKIP_TEST(msg.c_str()); + return; } HIP_CHECK(hipDeviceEnablePeerAccess(dst_device, 0)); }