diff --git a/benchmarking/run_cases.py b/benchmarking/run_cases.py index 55b798b..97142a7 100644 --- a/benchmarking/run_cases.py +++ b/benchmarking/run_cases.py @@ -63,12 +63,12 @@ def main(args): else: with open("../conf/cases.conf", "r") as f: case_lines = f.readlines() - for i in case_lines: - if i.strip() == "": - case_lines.remove(i) for line in case_lines: p = line.split() - testcase_list.append({"engine":p[0],"parameter":p[1:]}) + if len(p) > 0 and p!="\n": + if not p[0].startswith('#'): + testcase_list.append({"engine":p[0],"parameter":p[1:]}) + for testcase in testcase_list: if testcase["engine"] == "qemurbd": benchmark = qemurbd.QemuRbd() diff --git a/conf/config.py b/conf/config.py index d2fa8ba..5a7c71f 100644 --- a/conf/config.py +++ b/conf/config.py @@ -287,22 +287,18 @@ def get_config(self): try: with open(self.conf_path,"r") as f: lines = f.readlines() - for i in lines: - if i.strip() == "": - lines.remove(i) for line in lines: p = line.split() - testcase_list.append( self.parse_benchmark_cases( p ) ) + if len(p) != 0 and p!="\n": + testcase_list.append( self.parse_benchmark_cases( p ) ) except: common.bash("cp %s %s" % (self.default_conf_path, self.conf_path)) with open(self.conf_path,"r") as f: lines = f.readlines() - for i in lines: - if i.strip() == "": - lines.remove(i) for line in lines: p = line.split() - testcase_list.append( self.parse_benchmark_cases( p ) ) + if len(p) != 0 and p!="\n": + testcase_list.append( self.parse_benchmark_cases( p ) ) return testcase_list def parse_benchmark_cases(self, testcase): diff --git a/webui/static/js/Common.js b/webui/static/js/Common.js index af86c19..5b1d930 100644 --- a/webui/static/js/Common.js +++ b/webui/static/js/Common.js @@ -276,7 +276,8 @@ function CreateTableHTML_Benchmark(jsonObj){ }); tableHtml += ""; - tableHtml += "" + tableHtml += ""; + tableHtml += "