contest: vmksft-p: allow using a different test path than tools/testing/selftests/

YNL tests follow the same steps as ksft but they live
under tools/net/ynl/tests So allow using different
test "root" path. Other than that vmksft-p should
be able to just run them.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Author: kuba-moo

contest/remote/vmksft-p.py

@@ -60,10 +60,10 @@
 """
 
 
-def get_prog_list(vm, targets):
+def get_prog_list(vm, targets, test_path):
     tmpdir = tempfile.mkdtemp()
     targets = " ".join(targets)
-    vm.tree_cmd(['make', '-C', 'tools/testing/selftests/', 'TARGETS=' + targets, 'INSTALL_PATH=' + tmpdir, 'install'])
+    vm.tree_cmd(['make', '-C', test_path, 'TARGETS=' + targets, 'INSTALL_PATH=' + tmpdir, 'install'])
 
     with open(os.path.join(tmpdir, 'kselftest-list.txt'), "r") as fp:
         targets = fp.readlines()
@@ -129,6 +129,7 @@ def _parse_nested_tests(full_run, prev_results):
     return tests
 
 def _vm_thread(config, results_path, thr_id, hard_stop, in_queue, out_queue):
+    test_path = config.get('ksft', 'test_path', fallback='tools/testing/selftests')
     vm = None
     vm_id = -1
 
@@ -161,7 +162,7 @@ def _vm_thread(config, results_path, thr_id, hard_stop, in_queue, out_queue):
 
         print(f"INFO: thr-{thr_id} testing == " + prog)
         t1 = datetime.datetime.now()
-        vm.cmd(f'make -C tools/testing/selftests TARGETS="{target}" TEST_PROGS={prog} TEST_GEN_PROGS="" run_tests')
+        vm.cmd(f'make -C {test_path} TARGETS="{target}" TEST_PROGS={prog} TEST_GEN_PROGS="" run_tests')
         try:
             vm.drain_to_prompt(deadline=deadline)
             retcode = vm.bash_prev_retcode()
@@ -281,6 +282,7 @@ def test(binfo, rinfo, cbarg):
            rinfo['run-cookie']
     rinfo['link'] = link
     targets = config.get('ksft', 'target').split()
+    test_path = config.get('ksft', 'test_path', fallback='tools/testing/selftests')
     grp_name = "selftests-" + namify(targets[0])
 
     if config.get('device', 'info_script', fallback=None):
@@ -293,15 +295,15 @@ def test(binfo, rinfo, cbarg):
     build_ok = True
     kconfs = []
     for target in targets:
-        conf = f"tools/testing/selftests/{target}/config"
+        conf = f"{test_path}/{target}/config"
         if os.path.exists(os.path.join(vm.tree_path, conf)):
             kconfs.append(conf)
     build_ok &= vm.build(kconfs)
 
     shutil.copy(os.path.join(config.get('local', 'tree_path'), '.config'),
                 results_path + '/config')
     vm.tree_cmd("make headers")
-    ret = vm.tree_cmd(["make", "-C", "tools/testing/selftests/",
+    ret = vm.tree_cmd(["make", "-C", test_path,
                        "TARGETS=" + " ".join(targets)])
     build_ok &= ret == 0
     vm.dump_log(results_path + '/build')
@@ -313,7 +315,7 @@ def test(binfo, rinfo, cbarg):
             'link': link + '/build',
         }]
 
-    progs = get_prog_list(vm, targets)
+    progs = get_prog_list(vm, targets, test_path)
     progs.sort(reverse=True, key=lambda prog : cbarg.prev_runtime.get(prog, 0))
 
     dl_min = config.getint('executor', 'deadline_minutes', fallback=999999)