Merge commit '1_20_0' into merge

2 files changed, 16 insertions, 19 deletions

diff --git a/scripts/bloat-o-meter b/scripts/bloat-o-meter
index 0d3ff7f5e..6db2a5e58 100755
--- a/scripts/bloat-o-meter
+++ b/scripts/bloat-o-meter
@@ -39,25 +39,16 @@ if f1 is None or f2 is None:
 sym_args = " ".join(sys.argv[3 + flag_timing + dashes:])
 def getsizes(file):
     sym, alias, lut = {}, {}, {}
-    #dynsym_filter = re.compile("^\d+:\s+[\dA-Fa-f]+\s+\d+\s+\w+\s+\w+\s+\w+\s+\w+\s+\w+$")
     for l in os.popen("readelf -W -s %s %s" % (sym_args, file)).readlines():
-        if True:
-            l = l.strip()
-            if not (len(l) and l[0].isdigit() and len(l.split()) == 8):
-                continue
-            num, value, size, typ, bind, vis, ndx, name = l.split()
-            if ndx == "UND": continue # skip undefined
-            if typ in ["SECTION", "FILES"]: continue # skip sections and files
-        #else:
-        #    l = l.strip()
-        #    match = dynsym_filter.match(l)
-        #    if not match: continue
-        #    x, value, size, typ, bind, x, ndx, name = l.split()
-        #    if ndx == "UND": continue # skip undefined
-        #    if typ in ["SECTION", "FILES"]: continue # skip sections and files
+        l = l.strip()
+        if not (len(l) and l[0].isdigit() and len(l.split()) == 8):
+            continue
+        num, value, size, typ, bind, vis, ndx, name = l.split()
+        if ndx == "UND": continue # skip undefined
+        if typ in ["SECTION", "FILES"]: continue # skip sections and files
         if "." in name: name = "static." + name.split(".")[0]
         value = int(value, 16)
-        size = int(size)
+        size = int(size, 16) if size.startswith('0x') else int(size)
         if vis != "DEFAULT" and bind != "GLOBAL": # see if it is an alias
             alias[(value, size)] = {"name" : name}
         else:
diff --git a/scripts/randomtest.loop b/scripts/randomtest.loop
index 2c8a9bd35..758a8e862 100755
--- a/scripts/randomtest.loop
+++ b/scripts/randomtest.loop
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+run_testsuite=true
+
 test -d "$1" || { echo "'$1' is not a directory"; exit 1; }
 test -x "$1/scripts/randomtest" || { echo "No scripts/randomtest in '$1'"; exit 1; }
 
@@ -21,7 +23,9 @@ while sleep 1; do
                 echo "Failed build in: failed.$dir"
                 exit 1 # you may comment this out...
                 let fail++
-        else
+                continue
+        fi
+        if $run_testsuite; then
                 (
                         cd -- "$dir/testsuite" || exit 1
                         echo "Running testsuite in $dir..."
@@ -29,10 +33,12 @@ while sleep 1; do
                 )
                 if test $? != 0; then
                         echo "Failed runtest in $dir"
-                        exit 1
+                        exit 1 # you may comment this out...
+                        let fail++
+                        continue
                 fi
                 tail -n10 -- "$dir/testsuite/runtest.log"
-                rm -rf -- "$dir"
         fi
+        rm -rf -- "$dir"
         let cnt++
 done