Cleanup URM Test Framework (#205)

---
Signed-off-by: Kartik Nema <kartnema@qti.qualcomm.com>

Author: kartnema

contextual-classifier/Configs/classifier-blocklist.txt

@@ -1,3 +1,3 @@
 ls,cp,sh,mv,rm,mkdir,touch,find,irqbalance,cpuUsage.sh,which,sudo,cpu.sh,ln,uname
 grep,sed,awk,cat,tail,head,less,more,sort,uniq,wc,cut,tr,tee
-ps,top,sleep,journalctl,xargs,logrotate
+ps,top,sleep,journalctl,xargs,logrotate,systemctl

contextual-classifier/ContextualClassifier.cpp

@@ -252,7 +252,7 @@ void ContextualClassifier::ClassifierMain() {
                 // Untune any Configurations from the last proc-invocation
                 for(int64_t handle: this->mCurrRestuneHandles) {
                     if(handle > 0) {
-                        untuneRequestHelper(handle);
+                        this->untuneRequestHelper(handle);
                     }
                 }
                 this->mCurrRestuneHandles.clear();

tests/CMakeLists.txt

@@ -67,41 +67,48 @@ if(BUILD_TESTS)
                 set(FLORET_FOUND TRUE)
                 set(FLORET_LIBRARIES ${PC_FLORET_LIBRARIES})
                 set(FLORET_INCLUDE_DIRS ${PC_FLORET_INCLUDE_DIRS})
-                endif()
+            endif()
          endif()
 
         if(FLORET_FOUND)
             message(STATUS "floret found, building MLInference with USE_FLORET=1")
             add_definitions(-DUSE_FLORET=1)
 
             target_sources(UrmComponentTests PRIVATE
-                ${CMAKE_CURRENT_SOURCE_DIR}/Component/ContextClassificationTest.cpp)
+                ${CMAKE_CURRENT_SOURCE_DIR}/Component/ContextClassificationTest.cpp
+            )
 
-            target_link_libraries(UrmComponentTests PUBLIC ContextualClassifier
-                                                           ml_inference_lib)
+            target_link_libraries(UrmComponentTests PUBLIC
+                ContextualClassifier
+                ml_inference_lib
+            )
 
             target_include_directories(UrmComponentTests PRIVATE
-                ${CMAKE_SOURCE_DIR}/contextual-classifier/Include)
+                ${CMAKE_SOURCE_DIR}/contextual-classifier/Include
+            )
         else()
             message(STATUS "floret not found")
         endif()
     endif()
 
+    # Install
     install(TARGETS UrmComponentTests DESTINATION ${CMAKE_INSTALL_BINDIR})
 
     add_executable(UrmIntegrationTests Integration/IntegrationTests.cpp)
-
     target_link_libraries(UrmIntegrationTests PUBLIC UrmAuxUtils
                                                      UrmClient
                                                      RestuneTestUtils
                                                      ${LIBYAML_LIBRARIES})
     target_include_directories(UrmIntegrationTests PRIVATE ${LIBYAML_INCLUDE_DIRS})
 
     if(BUILD_CLASSIFIER)
-        target_sources(UrmIntegrationTests PRIVATE
-            ${CMAKE_CURRENT_SOURCE_DIR}/Integration/CCIntegrationTest.cpp)
+        target_sources(
+            UrmIntegrationTests PRIVATE
+            ${CMAKE_CURRENT_SOURCE_DIR}/Integration/CCIntegrationTests.cpp
+        )
     endif()
 
+    # Install
     install(TARGETS UrmIntegrationTests RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 endif()

tests/Integration/CCIntegrationTest.cpp tests/Integration/CCIntegrationTests.cpptests/Integration/CCIntegrationTest.cpp renamed to tests/Integration/CCIntegrationTests.cpp

@@ -1,13 +1,14 @@
 // Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 
-#include "ErrCodes.h"
-#include "UrmPlatformAL.h"
+#include <thread>
+
 #include "Utils.h"
-#include "TestUtils.h"
-#include "URMTests.h"
 #include "UrmAPIs.h"
-#include <thread>
+#include "ErrCodes.h"
+#include "URMTests.h"
+#include "TestUtils.h"
+#include "UrmPlatformAL.h"
 
 // Test configuration and paths
 #define TEST_CLASS "INTEGRATION"
@@ -17,7 +18,6 @@
 // Path to the Floret supervised learning model binary
 static const std::string FT_MODEL_PATH = CLASSIFIER_CONFIGS_DIR "floret_model_supervised.bin";
 
-
 /**
  * API under test: Tune / Untune
  * - Spawns GStreamer and verifies that correctly
@@ -45,16 +45,16 @@ URM_TEST(TestGstreamerPerAppConfigValidated, {
 
     // Verify executable exists before attempting spawn
     if (!AuxRoutines::fileExists("/usr/bin/gst-launch-1.0")) {
-        std::cout << LOG_BASE << "Executable not found: /usr/bin/gst-launch-1.0" << std::endl;
-        std::cout << LOG_BASE << "Status: SKIPPED" << std::endl;
+        LOG_SKIP("Executable not found: /usr/bin/gst-launch-1.0");
+        SKIP;
         return;
     }
 
     // Spawn GStreamer
     pid_t pid = fork();
     if (pid == 0) {
         // Child process: redirect output to suppress application noise
-        int devNull = open("/dev/null", O_WRONLY);
+        int32_t devNull = open("/dev/null", O_WRONLY);
         if (devNull != -1) {
             dup2(devNull, STDERR_FILENO);
             dup2(devNull, STDOUT_FILENO);
@@ -128,18 +128,15 @@ URM_TEST(TestViPerAppConfigValidated, {
 
     // Verify executable exists before attempting spawn
     if (!AuxRoutines::fileExists("/usr/bin/vi")) {
-        std::cout << LOG_BASE << "Executable not found: " <<"/usr/bin/vi"<< std::endl;
-        std::cout << LOG_BASE << "Status: SKIPPED" << std::endl;
-
-        // return from this Test case if not .exe not exist
-        return;
+        LOG_SKIP("Executable not found: /usr/bin/vi");
+        SKIP;
     }
 
     // Spawn vi
     pid_t pid = fork();
     if (pid == 0) {
         // Child process: redirect output to suppress application noise
-        int devNull = open("/dev/null", O_WRONLY);
+        int32_t devNull = open("/dev/null", O_WRONLY);
         if (devNull != -1) {
             dup2(devNull, STDERR_FILENO);
             dup2(devNull, STDOUT_FILENO);

tests/Integration/IntegrationTests.cpp

@@ -3,13 +3,13 @@
 
 #include <thread>
 
-#include "ErrCodes.h"
-#include "UrmPlatformAL.h"
 #include "Utils.h"
+#include "UrmAPIs.h"
+#include "ErrCodes.h"
+#include "URMTests.h"
 #include "TestUtils.h"
 #include "TestBaseline.h"
-#include "URMTests.h"
-#include "UrmAPIs.h"
+#include "UrmPlatformAL.h"
 
 #define TEST_CLASS "INTEGRATION"
 #define TEST_SUBCAT "INTEGRATION"
@@ -529,7 +529,7 @@ URM_TEST(ResourceLogicalToPhysicalTranslationVerification4, {
  * - Verify that the Resource Node's value remains unchanged.
  * Cross-Reference id: [H]
  */
-URM_TEST(UnSupportedResourceTuningVerification, {
+URM_TEST(TestUnSupportedResourceTuningVerification, {
     std::string testResourceName = "/etc/urm/tests/nodes/target_test_resource4.txt";
     int32_t testResourceOriginalValue = 516;
 
@@ -3668,6 +3668,12 @@ static std::string encodeCluster(const std::string& nodePath, int32_t physicalCl
 }
 
 URM_TEST(TestMultiResourceSignal, {
+    int32_t physicalClusterID = baseline.getExpectedPhysicalCluster(2);
+    if(physicalClusterID == -1) {
+        LOG_SKIP("Logical Cluster: 2 not found on test device, Skipping Test Case")
+        SKIP
+    }
+
     std::string clusResource = "/etc/urm/tests/nodes/cluster_type_resource_%d_cluster_id.txt";
     int32_t physicalClusterID0 = baseline.getExpectedPhysicalCluster(0);
     int32_t physicalClusterID1 = baseline.getExpectedPhysicalCluster(1);