From cc9d528a22ece0df0391a38794e21c60a0b23740 Mon Sep 17 00:00:00 2001
From: Safayat Ullah <safayat@google.com>
Date: Tue, 13 Dec 2022 09:21:08 +0000
Subject: igt: GTest: remove wrong subtest name

Bug: 246489995
Test: run KmsAtomicInterruptible test
Change-Id: I1404eb48b7b626f027c6bbc81b82e8ff6e429c03
---
 gtests/include/gtest_helper.h                 | 2 ++
 gtests/src/gtest_core_auth.cpp                | 2 +-
 gtests/src/gtest_core_getclient.cpp           | 2 +-
 gtests/src/gtest_gem_blt.cpp                  | 2 +-
 gtests/src/gtest_ion_fb.cpp                   | 2 +-
 gtests/src/gtest_kms_addfb_basic.cpp          | 2 +-
 gtests/src/gtest_kms_atomic.cpp               | 2 +-
 gtests/src/gtest_kms_atomic_interruptible.cpp | 6 +-----
 gtests/src/gtest_kms_atomic_transition.cpp    | 2 +-
 gtests/src/gtest_kms_flip.cpp                 | 2 +-
 gtests/src/gtest_kms_flip_tiling.cpp          | 2 +-
 gtests/src/gtest_kms_getfb.cpp                | 2 +-
 gtests/src/gtest_kms_plane_lowres.cpp         | 2 +-
 gtests/src/gtest_kms_plane_scaling.cpp        | 2 +-
 gtests/src/gtest_kms_prop_blob.cpp            | 2 +-
 gtests/src/gtest_kms_properties.cpp           | 2 +-
 gtests/src/gtest_kms_throughput.cpp           | 2 +-
 gtests/src/gtest_kms_vblank.cpp               | 2 +-
 gtests/src/gtest_syncobj_basic.cpp            | 2 +-
 gtests/src/gtest_syncobj_wait.cpp             | 2 +-
 20 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/gtests/include/gtest_helper.h b/gtests/include/gtest_helper.h
index e4d704786..d77f542c2 100644
--- a/gtests/include/gtest_helper.h
+++ b/gtests/include/gtest_helper.h
@@ -2,6 +2,8 @@
 #include <cstdlib>
 #include <string>
 
+static const char* binary_path = "/data/igt_tests";
+
 /**
  * @brief Run the testBinary for specific subtest and Pass/Fail/Skip depending on the log.
  *
diff --git a/gtests/src/gtest_core_auth.cpp b/gtests/src/gtest_core_auth.cpp
index 92fb4bbb2..efa0b3bf7 100644
--- a/gtests/src/gtest_core_auth.cpp
+++ b/gtests/src/gtest_core_auth.cpp
@@ -6,7 +6,7 @@
 class CoreAuthTests : public ::testing::Test {
     public:
     const char* testBinaryName = "core_auth";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
diff --git a/gtests/src/gtest_core_getclient.cpp b/gtests/src/gtest_core_getclient.cpp
index c86400842..d0ace9e95 100644
--- a/gtests/src/gtest_core_getclient.cpp
+++ b/gtests/src/gtest_core_getclient.cpp
@@ -7,7 +7,7 @@
 class CoreGetClientTests : public ::testing::Test {
     public:
     const char* testBinaryName = "core_getclient";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
diff --git a/gtests/src/gtest_gem_blt.cpp b/gtests/src/gtest_gem_blt.cpp
index 61fc9da1e..a2b81f344 100644
--- a/gtests/src/gtest_gem_blt.cpp
+++ b/gtests/src/gtest_gem_blt.cpp
@@ -7,7 +7,7 @@
 class GemBltTests : public ::testing::Test {
     public:
     const char* testBinaryName = "gem_blt";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
diff --git a/gtests/src/gtest_ion_fb.cpp b/gtests/src/gtest_ion_fb.cpp
index 3d6be9412..1956b2d00 100644
--- a/gtests/src/gtest_ion_fb.cpp
+++ b/gtests/src/gtest_ion_fb.cpp
@@ -6,7 +6,7 @@
 class IonFBTests : public ::testing::Test {
     public:
     const char* testBinaryName = "ion_fb";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
diff --git a/gtests/src/gtest_kms_addfb_basic.cpp b/gtests/src/gtest_kms_addfb_basic.cpp
index 881ab2988..9c85f51a8 100644
--- a/gtests/src/gtest_kms_addfb_basic.cpp
+++ b/gtests/src/gtest_kms_addfb_basic.cpp
@@ -6,7 +6,7 @@
 class KmsAddfbBasic : public ::testing::Test {
     public:
     const char* testBinaryName = "kms_addfb_basic";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
diff --git a/gtests/src/gtest_kms_atomic.cpp b/gtests/src/gtest_kms_atomic.cpp
index 2087627f7..232467f99 100644
--- a/gtests/src/gtest_kms_atomic.cpp
+++ b/gtests/src/gtest_kms_atomic.cpp
@@ -7,7 +7,7 @@
 class KmsAtomicTests : public ::testing::Test {
     public:
     const char* testBinaryName = "kms_atomic";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
diff --git a/gtests/src/gtest_kms_atomic_interruptible.cpp b/gtests/src/gtest_kms_atomic_interruptible.cpp
index 6fc837610..a098c429d 100644
--- a/gtests/src/gtest_kms_atomic_interruptible.cpp
+++ b/gtests/src/gtest_kms_atomic_interruptible.cpp
@@ -6,14 +6,10 @@
 class KmsAtomicInterruptible : public ::testing::Test {
     public:
     const char* testBinaryName = "kms_atomic_interruptible";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
-TEST_F(KmsAtomicInterruptible, TestIstSubtests) {
-    runSubTest(testBinaryName, "ist-subtests");
-}
-
 TEST_F(KmsAtomicInterruptible, TestLegacySetmode) {
     runSubTest(testBinaryName, "legacy-setmode");
 }
diff --git a/gtests/src/gtest_kms_atomic_transition.cpp b/gtests/src/gtest_kms_atomic_transition.cpp
index 77498d7ae..348adca10 100644
--- a/gtests/src/gtest_kms_atomic_transition.cpp
+++ b/gtests/src/gtest_kms_atomic_transition.cpp
@@ -6,7 +6,7 @@
 class KmsAtomicTransition : public ::testing::Test {
     public:
     const char* testBinaryName = "kms_atomic_transition";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
diff --git a/gtests/src/gtest_kms_flip.cpp b/gtests/src/gtest_kms_flip.cpp
index fcd00c33a..31c12089c 100644
--- a/gtests/src/gtest_kms_flip.cpp
+++ b/gtests/src/gtest_kms_flip.cpp
@@ -6,7 +6,7 @@
 class KmsFlipTests : public ::testing::Test {
     public:
     const char* testBinaryName = "kms_flip";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
diff --git a/gtests/src/gtest_kms_flip_tiling.cpp b/gtests/src/gtest_kms_flip_tiling.cpp
index ea0d0b05e..eaffd7db0 100644
--- a/gtests/src/gtest_kms_flip_tiling.cpp
+++ b/gtests/src/gtest_kms_flip_tiling.cpp
@@ -6,7 +6,7 @@
 class KmsFlipTiling : public ::testing::Test {
     public:
     const char* testBinaryName = "kms_flip_tiling";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
diff --git a/gtests/src/gtest_kms_getfb.cpp b/gtests/src/gtest_kms_getfb.cpp
index de760e3ec..49250b299 100644
--- a/gtests/src/gtest_kms_getfb.cpp
+++ b/gtests/src/gtest_kms_getfb.cpp
@@ -6,7 +6,7 @@
 class KmsGetfb : public ::testing::Test {
     public:
     const char* testBinaryName = "kms_getfb";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
diff --git a/gtests/src/gtest_kms_plane_lowres.cpp b/gtests/src/gtest_kms_plane_lowres.cpp
index 3c0630f7a..1c493f0e5 100644
--- a/gtests/src/gtest_kms_plane_lowres.cpp
+++ b/gtests/src/gtest_kms_plane_lowres.cpp
@@ -6,7 +6,7 @@
 class KmsPlaneLowres : public ::testing::Test {
     public:
     const char* testBinaryName = "kms_plane_lowres";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
diff --git a/gtests/src/gtest_kms_plane_scaling.cpp b/gtests/src/gtest_kms_plane_scaling.cpp
index 0ecbf202c..7e255ffcd 100644
--- a/gtests/src/gtest_kms_plane_scaling.cpp
+++ b/gtests/src/gtest_kms_plane_scaling.cpp
@@ -6,7 +6,7 @@
 class KmsPlaneScaling : public ::testing::Test {
     public:
     const char* testBinaryName = "kms_plane_scaling";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
diff --git a/gtests/src/gtest_kms_prop_blob.cpp b/gtests/src/gtest_kms_prop_blob.cpp
index 15745ecfd..853f5a110 100644
--- a/gtests/src/gtest_kms_prop_blob.cpp
+++ b/gtests/src/gtest_kms_prop_blob.cpp
@@ -6,7 +6,7 @@
 class KmsPropBlob : public ::testing::Test {
     public:
     const char* testBinaryName = "kms_prop_blob";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
diff --git a/gtests/src/gtest_kms_properties.cpp b/gtests/src/gtest_kms_properties.cpp
index 8812cc4d5..8adc7a5be 100644
--- a/gtests/src/gtest_kms_properties.cpp
+++ b/gtests/src/gtest_kms_properties.cpp
@@ -6,7 +6,7 @@
 class KmsPropertiesTests : public ::testing::Test {
     public:
     const char* testBinaryName = "kms_properties";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
diff --git a/gtests/src/gtest_kms_throughput.cpp b/gtests/src/gtest_kms_throughput.cpp
index 0e7274e33..4885221c3 100644
--- a/gtests/src/gtest_kms_throughput.cpp
+++ b/gtests/src/gtest_kms_throughput.cpp
@@ -7,7 +7,7 @@
 class KMSThroughputTests : public ::testing::Test {
     public:
     const char* testBinaryName = "kms_throughput";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
diff --git a/gtests/src/gtest_kms_vblank.cpp b/gtests/src/gtest_kms_vblank.cpp
index aef3f1adc..654eb2e7f 100644
--- a/gtests/src/gtest_kms_vblank.cpp
+++ b/gtests/src/gtest_kms_vblank.cpp
@@ -6,7 +6,7 @@
 class KmsVBlankTests : public ::testing::Test {
     public:
     const char* testBinaryName = "kms_vblank";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
diff --git a/gtests/src/gtest_syncobj_basic.cpp b/gtests/src/gtest_syncobj_basic.cpp
index 33b09c9aa..9a8fc3931 100644
--- a/gtests/src/gtest_syncobj_basic.cpp
+++ b/gtests/src/gtest_syncobj_basic.cpp
@@ -6,7 +6,7 @@
 class SyncobjBasic : public ::testing::Test {
     public:
     const char* testBinaryName = "syncobj_basic";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
diff --git a/gtests/src/gtest_syncobj_wait.cpp b/gtests/src/gtest_syncobj_wait.cpp
index 413e5f955..c97e0ff87 100644
--- a/gtests/src/gtest_syncobj_wait.cpp
+++ b/gtests/src/gtest_syncobj_wait.cpp
@@ -6,7 +6,7 @@
 class SyncobjWait : public ::testing::Test {
     public:
     const char* testBinaryName = "syncobj_wait";
-    void SetUp() override { chdir("/data/nativetest64/unrestricted"); }
+    void SetUp() override { chdir(binary_path); }
     void TearDown() override { chdir("/"); }
 };
 
-- 
cgit v1.2.3