Snap for 11526323 from fc54d4d8d5c368e103ace5ed0c436e6d21b94f55 to simpleperf-releasesimpleperf-release

Change-Id: I0c95591798f4556d1947951434b6080a19e5d100

4 files changed, 21 insertions, 9 deletions

diff --git a/scripts/build.py b/scripts/build.py
index 8df3563..62300f9 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -645,7 +645,6 @@ def create_test_map(args, build_config, projects):
 
 def main(default_config=None, emulator=True):
     top = os.path.abspath(os.path.join(script_dir, "../../../../.."))
-    os.chdir(top)
 
     parser = argparse.ArgumentParser()
 
@@ -658,7 +657,7 @@ def main(default_config=None, emulator=True):
     )
     parser.add_argument(
         "--build-root",
-        type=str,
+        type=os.path.abspath,
         default=os.path.join(top, "build-root"),
         help="Root of intermediate build directory.",
     )
@@ -740,6 +739,13 @@ def main(default_config=None, emulator=True):
     )
     args = parser.parse_args()
 
+    # Change the current directory to the Trusty root
+    # We do this after parsing all the arguments because
+    # some of the paths, e.g., build-root, might be relative
+    # to the directory that the script was called from, not
+    # to the Trusty root directory
+    os.chdir(top)
+
     build_config = TrustyBuildConfig(
         config_file=args.config, android=args.android
     )
diff --git a/scripts/log_processor.py b/scripts/log_processor.py
index b30d930..2fe33f3 100755
--- a/scripts/log_processor.py
+++ b/scripts/log_processor.py
@@ -183,6 +183,7 @@ class LogProcessor(threading.Thread):
         white = "\x1b[37;20m"
         bold_white = "\x1b[37;1m"
         grey = "\x1b[38;20m"
+        bold = "\x1b[1m"
         reset = "\x1b[0m"
 
     def __init__(self, stream, err, pinned, lock, colored, log_file):
@@ -335,17 +336,17 @@ class LogProcessor(threading.Thread):
                     # keep it as is
                     pass
                 elif (pos := line.lower().find('error')) != -1:
-                    line = self.colorize(line[:pos], self.color.bold_white) + \
+                    line = self.colorize(line[:pos], self.color.bold) + \
                            self.colorize('error', self.color.bold_red) + \
                            self.colorize(line[pos + len('error'):],
-                                         self.color.bold_white)
+                                         self.color.bold)
                 elif (pos := line.lower().find('warning')) != -1:
-                    line = self.colorize(line[:pos], self.color.bold_white) + \
+                    line = self.colorize(line[:pos], self.color.bold) + \
                            self.colorize('warning', self.color.bold_magenta) + \
                            self.colorize(line[pos + len('warning'):],
-                                         self.color.bold_white)
+                                         self.color.bold)
                 else:
-                    line = self.colorize(line, self.color.bold_white)
+                    line = self.colorize(line, self.color.bold)
 
             self.erase_pinned()
             print(line, end = "")
diff --git a/scripts/test-map b/scripts/test-map
index 5b4b1f5..cc74cea 100644
--- a/scripts/test-map
+++ b/scripts/test-map
@@ -455,7 +455,11 @@
                                 "*/NewKeyGenerationTest.EcdsaAttestationIdTags*:"
                                 "*/NewKeyGenerationTest.EcdsaAttestationUniqueId*:"
                                 "*/NewKeyGenerationTest.EcdsaAttestationTagNoApplicationId*:"
-                                "*/NewKeyGenerationTest.AttestationApplicationIDLengthProperlyEncoded*"
+                                "*/NewKeyGenerationTest.AttestationApplicationIDLengthProperlyEncoded*:"
+                                "*/BootloaderStateTest.VbStateIsUnverified*:"
+                                "*/BootloaderStateTest.VbmetaDigest*:"
+                                "*InstanceTest.AidlVersionInFeature*:"
+                                "*InstanceTest.FeatureVersionInAidl*:"
                                 "\"",
                         timeout=(60 * 60)),
 
diff --git a/scripts/trusty_build_config.py b/scripts/trusty_build_config.py
index ca8b591..18fd9e1 100755
--- a/scripts/trusty_build_config.py
+++ b/scripts/trusty_build_config.py
@@ -345,7 +345,8 @@ class TrustyBuildConfig(object):
                 provides = TrustyPortTestFlags(android=True,
                                                storage_boot=True,
                                                storage_full=True,
-                                               smp4=True)
+                                               smp4=True,
+                                               abl=True)
 
             return [test.into_androidporttest(nameprefix=nameprefix,
                                               cmdargs=cmdargs,