support running single ctest

Author: xylian86

core/run_ctest/main.py

@@ -14,7 +14,7 @@
 project = p_input["project"]
 
 
-def main(argv):
+def main():
     print(">>>>[ctest_core] running project {}".format(project))
     s = time.time()
     os.makedirs(os.path.join(RUNCTEST_TR_DIR, project), exist_ok=True)
@@ -23,27 +23,17 @@ def main(argv):
             print(">>>>[ctest_core] input conf file: {}".format(conf_file_path))
             test_input = extract_conf_diff(conf_file_path)
             test_conf_file(conf_file_path, test_input)
-    elif run_mode == "run_single_ctest":
-        for conf_file_path in sorted(glob.glob(os.path.join(p_input["conf_file_dir"], "*"))):
-            print(">>>>[ctest_core] input conf file: {}".format(conf_file_path))
-            test_input = extract_conf_diff(conf_file_path)
-            test_conf_file(conf_file_path, test_input, argv[1])
     else:
         sys.exit(">>>>[ctest_core] invalid run_mode")
     print(">>>>[ctest_core] total time: {} seconds".format(time.time() - s))
 
-def test_conf_file(conf_file_path, test_input, ctestname = "notuse"):
+def test_conf_file(conf_file_path, test_input):
     fbase = os.path.splitext(os.path.basename(conf_file_path))[0]
     params = test_input.keys()
     if run_mode == "run_ctest":
         associated_test_map, associated_tests = extract_mapping(mapping, params)
         print(">>>>[ctest_core] # parameters associated with the run: {}".format(len(params)))
         print(">>>>[ctest_core] # ctests to run in total: {}".format(len(associated_tests)))
-    elif run_mode == "run_single_ctest":
-        associated_test_map = dict([[i, list((ctestname, ))] for i in params if ctestname in mapping[i]])
-        associated_tests = set((ctestname, ))
-        print(">>>>[ctest_core] # parameters associated with the run: {}".format(len(params)))
-        print(">>>>[ctest_core] # single ctest to run")
     tr_file = open(os.path.join(RUNCTEST_TR_DIR, project, TR_FILE.format(id=fbase)), "w")
     mt_file = open(os.path.join(RUNCTEST_TR_DIR, project, MT_FILE.format(id=fbase)), "w")
     if len(associated_tests) != 0:
@@ -69,4 +59,4 @@ def test_conf_file(conf_file_path, test_input, ctestname = "notuse"):
 
 
 if __name__ == '__main__':
-    main(sys.argv)
+    main()

core/run_ctest/parse_input.py

@@ -105,6 +105,15 @@ def extract_conf_diff(path):
     print(">>>>[ctest_core] config diff: {} (param, value) pairs".format(len(conf_diff)))
     return conf_diff
 
+def extract_conf_diff_from_pair(param_value_dict):
+    default_conf_map = load_default_conf(DEFAULT_CONF_FILE[project]) 
+    conf_diff = {}
+    for param, value in param_value_dict.items():
+        if param not in default_conf_map:
+            print(">>>>[ctest_core] parameter {} in input config file is not in default config file".format(param))
+        if param not in default_conf_map or value != default_conf_map[param]:
+            conf_diff[param] = value
+    return conf_diff    
 
 def parse_mapping(path):
     print(">>>>[ctest_core] loading mapping {}".format(path))

core/run_ctest/run_ctest.sh

@@ -2,14 +2,4 @@
 
 # please specify data input in program_input.py before running this script
 
-ctestname=$1
-function main() {
-    if [ -z $ctestname ]
-    then 
-        python3 main.py 
-    else
-        python3 main.py $ctestname
-    fi
-}
-
-main
+python3 main.py

core/run_ctest/run_single_ctest.py

@@ -0,0 +1,42 @@
+import sys, time
+
+from program_input import p_input
+from main import test_conf_file
+from parse_input import *
+
+run_mode = p_input["run_mode"]
+project = p_input["project"]
+mapping = parse_mapping(p_input["mapping_path"])
+from run_test import run_test_batch
+
+def main(argv):
+    print(">>>>[ctest_core] running project {}".format(project))
+    s = time.time()
+    ctestname = argv[1]
+    if run_mode == "run_ctest":
+        print("Please use the run_single_ctest mode")
+        return 
+    elif run_mode == "run_single_ctest":
+        param_value_dict = {}
+        for i in range(2, len(argv)):
+            param, value = argv[i].split('=')
+            param_value_dict[param] = value
+        test_input = extract_conf_diff_from_pair(param_value_dict)
+        test_conf_file(test_input, ctestname)
+        print(">>>>[ctest_core] total time: {} seconds".format(time.time() - s))
+
+def test_conf_file(test_input, ctestname):
+    params = test_input.keys()
+    associated_test_map = dict([[i, list((ctestname, ))] for i in params if ctestname in mapping[i]])
+    associated_tests = set((ctestname, ))
+    print(">>>>[ctest_core] # parameters associated with the run: {}".format(len(params)))
+    tr = run_test_batch(test_input, associated_test_map)
+    tup = tr.ran_tests_and_time.pop()
+    test, mvntime = tup.split("\t")
+    if test in tr.failed_tests:
+        print(">>>>[ctest_core] The single ctest FAIL")
+    else:
+        print(">>>>[ctest_core] The single ctest PASS")
+
+if __name__ == "__main__":
+    main(sys.argv)  

core/run_ctest/show_pset.py

@@ -0,0 +1,13 @@
+import sys, json
+
+def main(argv):
+    mapping = json.load(open("../../data/ctest_mapping/opensource-zookeeper-server.json"))
+    count = 0
+    for key, value in mapping.items():
+        if argv[1] in value:
+            count += 1
+            print("p", count," ", key, sep='')
+    print("Number of parameter is", count)
+
+if __name__ == "__main__":
+    main(sys.argv)