From f82011bc667758a7247d1565e45358cbac18c4f8 Mon Sep 17 00:00:00 2001
From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com>
Date: Thu, 10 Mar 2022 16:45:54 +0530
Subject: [PATCH] SWDEV-321511 - Enable device related disabled tests on Nvidia
 platform (#2518)

Change-Id: I95a62e9562a638cb3525862b9a5d2e640c10882c

[ROCm/hip-tests commit: 4b3f334131745de521bda46d168664870c1970cc]
---
 projects/hip-tests/catch/unit/device/hipChooseDevice.cc      | 5 +----
 .../hip-tests/catch/unit/device/hipGetDeviceProperties.cc    | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/projects/hip-tests/catch/unit/device/hipChooseDevice.cc b/projects/hip-tests/catch/unit/device/hipChooseDevice.cc
index fa5e5089f7..0cbcc68a4a 100644
--- a/projects/hip-tests/catch/unit/device/hipChooseDevice.cc
+++ b/projects/hip-tests/catch/unit/device/hipChooseDevice.cc
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2022 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -41,8 +41,6 @@ TEST_CASE("Unit_hipChooseDevice_ValidateDevId") {
  * Scenario1: Validates if dev = nullptr returns error code
  * Scenario2: Validates if prop = nullptr returns error code
  */
-#if HT_AMD
-// These test scenarios fail on NVIDIA.
 TEST_CASE("Unit_hipChooseDevice_NegTst") {
   hipDeviceProp_t prop;
   int dev = -1;
@@ -57,4 +55,3 @@ TEST_CASE("Unit_hipChooseDevice_NegTst") {
     REQUIRE_FALSE(hipSuccess == hipChooseDevice(&dev, nullptr));
   }
 }
-#endif
diff --git a/projects/hip-tests/catch/unit/device/hipGetDeviceProperties.cc b/projects/hip-tests/catch/unit/device/hipGetDeviceProperties.cc
index e644f3d397..fe5ba6ffd6 100644
--- a/projects/hip-tests/catch/unit/device/hipGetDeviceProperties.cc
+++ b/projects/hip-tests/catch/unit/device/hipGetDeviceProperties.cc
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2022 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -182,14 +182,11 @@ TEST_CASE("Unit_hipGetDeviceProperties_ArchPropertiesTst") {
 TEST_CASE("Unit_hipGetDeviceProperties_NegTst") {
   hipDeviceProp_t prop;
 
-#if HT_AMD
   SECTION("props is nullptr") {
     int device;
     HIP_CHECK(hipGetDevice(&device));
-    // this test case results in segmentation fault on NVCC
     REQUIRE_FALSE(hipSuccess == hipGetDeviceProperties(nullptr, device));
   }
-#endif
 
   SECTION("device is -1") {
     REQUIRE_FALSE(hipSuccess == hipGetDeviceProperties(&prop, -1));