fixed sanity-check warnings

Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>

2 files changed, 81 insertions, 51 deletions

diff --git a/automated/linux/ltp-realtime/ltp-realtime.py b/automated/linux/ltp-realtime/ltp-realtime.py
index 8a5cda7c..dc089a5f 100755
--- a/automated/linux/ltp-realtime/ltp-realtime.py
+++ b/automated/linux/ltp-realtime/ltp-realtime.py
@@ -6,37 +6,49 @@ import fileinput
 
 # extract a standard results block from the stream
 def standard_results():
-    minimum = re.compile("^Min:\s+(?P<min>[\d\.]+)\s+(?P<units>\w+)")
-    maximum = re.compile("^Max:\s+(?P<max>[\d\.]+)\s+(?P<units>\w+)")
-    average = re.compile("^Avg:\s+(?P<average>[\d\.]+)\s+(?P<units>\w+)")
-    standarddev = re.compile("^StdDev:\s+(?P<stddev>[\d\.]+)\s+(?P<units>\w+)")
+    minimum = re.compile(r"^Min:\s+(?P<min>[\d\.]+)\s+(?P<units>\w+)")
+    maximum = re.compile(r"^Max:\s+(?P<max>[\d\.]+)\s+(?P<units>\w+)")
+    average = re.compile(r"^Avg:\s+(?P<average>[\d\.]+)\s+(?P<units>\w+)")
+    standarddev = re.compile(r"^StdDev:\s+(?P<stddev>[\d\.]+)\s+(?P<units>\w+)")
     finished = 0
     for line in sys.stdin:
         for parser in [maximum, minimum, average, standarddev]:
             result = parser.search(line)
             if result is not None:
                 if parser is minimum:
-                    test_min = result.group('min')
-                    units = result.group('units')
-                    print "%s%s_min pass %s %s  " % (test_name, test_args, test_min, units)
+                    test_min = result.group("min")
+                    units = result.group("units")
+                    print(
+                        "%s%s_min pass %s %s  "
+                        % (test_name, test_args, test_min, units)
+                    )
                     finished += 1
                     break
                 if parser is maximum:
-                    test_max = result.group('max')
-                    units = result.group('units')
+                    test_max = result.group("max")
+                    units = result.group("units")
                     finished += 1
-                    print "%s%s_max pass %s %s  " % (test_name, test_args, test_max, units)
+                    print(
+                        "%s%s_max pass %s %s  "
+                        % (test_name, test_args, test_max, units)
+                    )
                     break
                 if parser is average:
-                    test_avg = result.group('average')
-                    units = result.group('units')
-                    print "%s%s_avg pass %s %s  " % (test_name, test_args, test_avg, units)
+                    test_avg = result.group("average")
+                    units = result.group("units")
+                    print(
+                        "%s%s_avg pass %s %s  "
+                        % (test_name, test_args, test_avg, units)
+                    )
                     finished += 1
                     break
                 if parser is standarddev:
-                    test_stddev = result.group('stddev')
-                    units = result.group('units')
-                    print "%s%s_stddev pass %s %s  " % (test_name, test_args, test_stddev, units)
+                    test_stddev = result.group("stddev")
+                    units = result.group("units")
+                    print(
+                        "%s%s_stddev pass %s %s  "
+                        % (test_name, test_args, test_stddev, units)
+                    )
                     finished += 1
                     break
             else:
@@ -44,20 +56,20 @@ def standard_results():
         if finished == 4:
             return
 
-    print "ERROR: Parser failed and ran to EOF"
+    print("ERROR: Parser failed and ran to EOF")
     sys.exit(-1)
 
 
 def result_results():
-    results = re.compile("Result:\s+(?P<result>\w+)")
+    results = re.compile(r"Result:\s+(?P<result>\w+)")
     finished = 0
     for line in sys.stdin:
         for parser in [results]:
             result = parser.search(line)
             if result is not None:
                 if parser is results:
-                    test_result = result.group('result')
-                    print "%s-%s %s" % (test_name, test_args, test_result)
+                    test_result = result.group("result")
+                    print("%s-%s %s" % (test_name, test_args, test_result))
                     finished += 1
                     break
             else:
@@ -65,21 +77,24 @@ def result_results():
         if finished == 1:
             return
 
-    print "ERROR: Parser failed and ran to EOF"
+    print("ERROR: Parser failed and ran to EOF")
     sys.exit(-1)
 
 
 def sched_jitter_results():
-    maximum = re.compile("^max jitter:\s+(?P<max>[\d\.]+)\s+(?P<units>\w+)")
+    maximum = re.compile(r"^max jitter:\s+(?P<max>[\d\.]+)\s+(?P<units>\w+)")
     finished = 0
     for line in sys.stdin:
         for parser in [maximum]:
             result = parser.search(line)
             if result is not None:
                 if parser is maximum:
-                    test_max = result.group('max')
-                    units = result.group('units')
-                    print "%s%s_max_jitter pass %s  %s" % (test_name, test_args, test_max, units)
+                    test_max = result.group("max")
+                    units = result.group("units")
+                    print(
+                        "%s%s_max_jitter pass %s  %s"
+                        % (test_name, test_args, test_max, units)
+                    )
                     finished += 1
                     break
             else:
@@ -88,42 +103,53 @@ def sched_jitter_results():
             # print "min:%s max:%s avg:%s stddev:%s" % (test_min, test_max, test_avg, test_stddev)
             return
 
-    print "ERROR: Parser failed and ran to EOF"
+    print("ERROR: Parser failed and ran to EOF")
     sys.exit(-1)
 
 
 def pi_perf_results():
-    minimum = re.compile("^Min delay =\s+(?P<min>[\d\.]+)\s+(?P<units>\w+)")
-    maximum = re.compile("^Max delay =\s+(?P<max>[\d\.]+)\s+(?P<units>\w+)")
-    average = re.compile("^Average delay =\s+(?P<average>[\d\.]+)\s+(?P<units>\w+)")
-    standarddev = re.compile("^Standard Deviation =\s+(?P<stddev>[\d\.]+)\s+(?P<units>\w+)")
+    minimum = re.compile(r"^Min delay =\s+(?P<min>[\d\.]+)\s+(?P<units>\w+)")
+    maximum = re.compile(r"^Max delay =\s+(?P<max>[\d\.]+)\s+(?P<units>\w+)")
+    average = re.compile(r"^Average delay =\s+(?P<average>[\d\.]+)\s+(?P<units>\w+)")
+    standarddev = re.compile(
+        r"^Standard Deviation =\s+(?P<stddev>[\d\.]+)\s+(?P<units>\w+)"
+    )
     finished = 0
     for line in sys.stdin:
         for parser in [maximum, minimum, average, standarddev]:
             result = parser.search(line)
             if result is not None:
                 if parser is minimum:
-                    test_min = result.group('min')
-                    units = result.group('units')
-                    print "%s%s_min pass %s %s" % (test_name, test_args, test_min, units)
+                    test_min = result.group("min")
+                    units = result.group("units")
+                    print(
+                        "%s%s_min pass %s %s" % (test_name, test_args, test_min, units)
+                    )
                     finished += 1
                     break
                 if parser is maximum:
-                    test_max = result.group('max')
-                    units = result.group('units')
-                    print "%s%s_max pass %s %s" % (test_name, test_args, test_max, units)
+                    test_max = result.group("max")
+                    units = result.group("units")
+                    print(
+                        "%s%s_max pass %s %s" % (test_name, test_args, test_max, units)
+                    )
                     finished += 1
                     break
                 if parser is average:
-                    test_avg = result.group('average')
-                    units = result.group('units')
-                    print "%s%s_avg pass %s %s" % (test_name, test_args, test_avg, units)
+                    test_avg = result.group("average")
+                    units = result.group("units")
+                    print(
+                        "%s%s_avg pass %s %s" % (test_name, test_args, test_avg, units)
+                    )
                     finished += 1
                     break
                 if parser is standarddev:
-                    test_stddev = result.group('stddev')
-                    units = result.group('units')
-                    print "%s%s_stddev pass %s %s" % (test_name, test_args, test_stddev, units)
+                    test_stddev = result.group("stddev")
+                    units = result.group("units")
+                    print(
+                        "%s%s_stddev pass %s %s"
+                        % (test_name, test_args, test_stddev, units)
+                    )
                     finished += 1
                     break
             else:
@@ -131,7 +157,7 @@ def pi_perf_results():
         if finished == 4:
             return
 
-    print "ERROR: Parser failed and ran to EOF"
+    print("ERROR: Parser failed and ran to EOF")
     sys.exit(-1)
 
 
@@ -201,29 +227,32 @@ def periodic_cpu_load():
 def async_handler_jk():
     result_results()
 
+
 # Parse the input stream and tuen test names into function calls to parse their
 # details
 
-test_start = re.compile("--- Running testcase (?P<name>[a-zA-Z0-9_-]+)\s+(?P<args>[a-zA-Z0-9_.\- ]*?)\s*---")
-test_finish = re.compile("The .* test appears to have completed.")
+test_start = re.compile(
+    r"--- Running testcase (?P<name>[a-zA-Z0-9_-]+)\s+(?P<args>[a-zA-Z0-9_.\- ]*?)\s*---"
+)
+test_finish = re.compile(r"The .* test appears to have completed.")
 
 for line in sys.stdin:
     for parser in [test_start, test_finish]:
         result = parser.search(line)
         if result is not None:
             if parser is test_start:
-                test_name = result.group('name')
-                func_name = result.group('name')
+                test_name = result.group("name")
+                func_name = result.group("name")
                 func_name = func_name.replace("-", "_")
-                test_args = result.group('args')
+                test_args = result.group("args")
                 test_args = test_args.replace(" ", "-")
-                print
-                print "test_start = " + test_name + test_args
+                print("")
+                print("test_start = " + test_name + test_args)
                 globals()[func_name]()
                 break
 
             if parser is test_finish:
-                print "test_finished = " + test_name + test_args
+                print("test_finished = " + test_name + test_args)
                 break
         else:
             continue
diff --git a/automated/linux/ltp-realtime/ltp-realtime.sh b/automated/linux/ltp-realtime/ltp-realtime.sh
index f8dc2623..df171573 100755
--- a/automated/linux/ltp-realtime/ltp-realtime.sh
+++ b/automated/linux/ltp-realtime/ltp-realtime.sh
@@ -32,6 +32,7 @@ while getopts "T:s:v:" arg; do
      # SKIP_INSTALL is false in case of Debian builds
      s) SKIP_INSTALL="${OPTARG}";;
      v) LTP_VERSION="${OPTARG}";;
+     *) ;;
   esac
 done