From bbbe4fd30b4c827c46f525217f02c3cd6a2df63c Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Mon, 20 Sep 2021 09:41:45 +0530 Subject: [PATCH] Fix catch2 unit test build failure Incorrect resolution of merge conflict resulted in not updating tests/catch/unit/memory/CMakeLists.txt correctly [ROCm/hip-tests commit: b7193e19da31cdd28eccfea51927a04716cc7070] --- projects/hip-tests/catch/unit/memory/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/hip-tests/catch/unit/memory/CMakeLists.txt b/projects/hip-tests/catch/unit/memory/CMakeLists.txt index 61571884a1..a4619410b6 100644 --- a/projects/hip-tests/catch/unit/memory/CMakeLists.txt +++ b/projects/hip-tests/catch/unit/memory/CMakeLists.txt @@ -32,7 +32,6 @@ set(TEST_SRC hipHostGetFlags.cc hipMemoryAllocateCoherent.cc hipMallocManaged_MultiScenario.cc - hipManagedKeyword.cc hipMemsetInvalidPtr.cc hipMemset.cc hipMemsetAsyncMultiThread.cc @@ -77,7 +76,6 @@ set(TEST_SRC hipHostGetFlags.cc hipMemoryAllocateCoherent.cc hipMallocManaged_MultiScenario.cc - hipManagedKeyword.cc hipMemsetInvalidPtr.cc hipMemset.cc hipMemsetAsyncMultiThread.cc