Add SST-Info interactive test, quit command

sstsimulator · Jul 17, 2024 · f258480 · f258480
1 parent 0350185
commit f258480
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/src/sst/core/sstinfo.cc b/src/sst/core/sstinfo.cc
@@ -216,6 +216,7 @@ parseInput(std::string input)
                 "- Help : Displays this help message\n"
                 "- List {element.subelement} : Displays element libraries and component information\n"
                 "- Find {field} {search string} : Displays all components with the given search string in its field\n\n"
+                "- Quit : Exits the program\n\n"
                 "To see more detailed instructions, type in a command without additional parameters.\n\n";
         }
         else if ( command == "list" ) {
@@ -260,6 +261,9 @@ parseInput(std::string input)
                    "find CATEGORY UNCATEGORIZED\n"
                    "find parameters rng";
         }
+        else if ( command == "quit" ) {
+            return command;
+        }
         else {
             text = getErrorText(command);
         }
@@ -1118,8 +1122,10 @@ InteractiveWindow::getInput()
             if ( input != "" ) {
                 g_prevInput.push_front(input);
                 output = parseInput(input);
-                setInfoText(output);
 
+                if ( output == "quit" ) { break; }
+
+                setInfoText(output);
                 g_window.draw();
                 g_window.printInfo();
                 input    = "";
@@ -1188,6 +1194,7 @@ InteractiveWindow::getInput()
         // Make sure the cursor resets to the correct place
         g_window.resetCursor(input.size() + 1);
     }
+    endwin();
 }
 
 void

diff --git a/src/sst/core/testingframework/sst_unittest.py b/src/sst/core/testingframework/sst_unittest.py
@@ -24,6 +24,7 @@
 
 import sys
 import os
+import platform
 import unittest
 import threading
 import time

diff --git a/tests/testsuite_default_sstinfo.py b/tests/testsuite_default_sstinfo.py
@@ -51,11 +51,14 @@ def tearDown(self):
 #####
 
     def test_sstinfo_coretestelement(self):
-        self.sstinfo_test_template("coreTestElement")
+        self.sstinfo_test_template("coreTestElement", "-q")
 
+    def test_sstinfo_interactive(self):
+        self.sstinfo_test_template("interactive", "-i")
+
 #####
 
-    def sstinfo_test_template(self, testtype):
+    def sstinfo_test_template(self, testtype, flags):
         testsuitedir = self.get_testsuite_dir()
         outdir = test_output_get_run_dir()
 
@@ -67,9 +70,12 @@ def sstinfo_test_template(self, testtype):
         err_str = "Path to SST-INFO {0}; does not exist...".format(sst_app_path)
         self.assertTrue(os.path.isdir(sst_app_path), err_str)
 
-        cmd = '{0}/sst-info -q {1}'.format(sst_app_path, testtype)
+        if platform.system() == "Linux":
+            cmd = 'timeout 1 {0}/sst-info coreTestElement {1}'.format(sst_app_path, flags)
+        else:
+            cmd = "perl -e 'alarm shift; exec @ARGV' 1 {0}/sst-info coreTestElement {1}".format(sst_app_path, flags)
         rtn = OSCommand(cmd, output_file_path = outfile, error_file_path = errfile).run()
-        if rtn.result() != 0:
+        if rtn.result() != (0 or 124):
             self.assertEquals(rtn.result(), 0, "sst-info Test failed running cmdline {0} - return = {1}".format(cmd, rtn.result()))
             with open(outfile, 'r') as f:
                 log_failure("FAILURE: sst-info cmdline {0}; output =\n{1}".format(cmd, f.read()))