selftest.run: Factor out expand_command_run.

1 files changed, 38 insertions, 1 deletions

diff --git a/selftest/run.py b/selftest/run.py
index c40dd7e389..25f3e5d7c9 100644
--- a/selftest/run.py
+++ b/selftest/run.py
@@ -15,7 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import subprocess
+import os
+import tempfile
 import warnings
 
 # expand strings from %ENV
@@ -31,3 +32,39 @@ def expand_command_list(cmd):
     if not "$LISTOPT" in cmd:
         return None
     return cmd.replace("$LISTOPT", "--list")
+
+
+def expand_command_run(cmd, supports_loadfile, supports_idlist, subtests=None):
+    """Expand a test command.
+
+    :param cmd: Command to expand
+    :param supports_loadfile: Whether command supports loadfile
+    :param supports_idlist: Whether the command supports running specific
+        subtests
+    :param subtests: List of subtests to run - None for all subtests
+    :return: Tuple with command to run and temporary file to remove after
+        running (or None)
+    """
+    # Generate a file with the individual tests to run, if the
+    # test runner for this test suite supports it.
+    if subtests is None:
+        return (cmd.replace("$LOADLIST", ""), None)
+    if supports_loadfile:
+        (fd, listid_file) = tempfile.mkstemp()
+        f = os.fdopen(fd, 'w')
+        try:
+            for test in subtests:
+                f.write(test+"\n")
+        finally:
+            f.close()
+        return (
+            cmd.replace("$LOADLIST", "--load-list=%s" % listid_file),
+            listid_file)
+    elif supports_idlist:
+        cmd += " " + " ".join(subtests)
+        return (cmd, None)
+    else:
+        warnings.warn(
+            "Running subtests requested, but command does not support "
+            "this.")
+        return (cmd, None)