From 88e1d03d46ab18651a87633181d46f92887b70ee Mon Sep 17 00:00:00 2001
From: Anthony Barbier <anthony.barbier@arm.com>
Date: Thu, 13 Jun 2019 15:20:20 +0100
Subject: Report skipped tests in the results.

- Keep track of the tests which are skipped because they're known to fail.
- Moved multithreading code in a separate module so it can be re-used.
- Keep track of the tests which are skipped because the CPU is missing features.
- Added --verbose mode

Change-Id: I8832a1ac10738461eb5f4740e8bf060f13866132
---
 test/aarch64/test-assembler-aarch64.h  | 10 ++++++----
 test/aarch64/test-simulator-aarch64.cc |  6 ++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'test/aarch64')

diff --git a/test/aarch64/test-assembler-aarch64.h b/test/aarch64/test-assembler-aarch64.h
index b45c7ae8..cc4160b4 100644
--- a/test/aarch64/test-assembler-aarch64.h
+++ b/test/aarch64/test-assembler-aarch64.h
@@ -302,10 +302,12 @@ inline bool CanRun(const CPUFeatures& required, bool* queried_can_run) {
   if (!*queried_can_run) {
     *queried_can_run = true;
     CPUFeatures missing = required.Without(cpu);
-    std::cout << "Warning: This test cannot execute its generated code on this "
-                 "CPU.\n";
-    std::cout << "  Required: { " << required << " }\n";
-    std::cout << "   Missing: { " << missing << " }\n";
+    // Note: This message needs to match REGEXP_MISSING_FEATURES from
+    // tools/threaded_test.py.
+    std::cout << "SKIPPED: Missing features: { " << missing << " }\n";
+    std::cout << "This test requires the following features to run its "
+                 "generated code on this CPU: "
+              << required << "\n";
   }
   return false;
 }
diff --git a/test/aarch64/test-simulator-aarch64.cc b/test/aarch64/test-simulator-aarch64.cc
index b145bb9a..257326f1 100644
--- a/test/aarch64/test-simulator-aarch64.cc
+++ b/test/aarch64/test-simulator-aarch64.cc
@@ -142,8 +142,10 @@ namespace aarch64 {
       *skipped = false;                                                       \
     } else {                                                                  \
       std::stringstream os;                                                   \
-      os << "Warning: skipping test due to missing CPU features.\n";          \
-      os << "  Missing: {" << requirements.Without(this_machine) << "}\n";    \
+      /* Note: This message needs to match REGEXP_MISSING_FEATURES from    */ \
+      /* tools/threaded_test.py.                                           */ \
+      os << "SKIPPED: Missing features: { ";                                  \
+      os << requirements.Without(this_machine) << " }\n";                     \
       printf("%s", os.str().c_str());                                         \
       *skipped = true;                                                        \
     }                                                                         \
-- 
cgit v1.2.3