CI: fix bug in getting AMD's coverage

Signed-off-by: Diana Popa <[email protected]>

Author: dianpopa

tests/host_tools/proc.py

@@ -0,0 +1,24 @@
+# Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+"""Utility functions for interacting with the processor."""
+import re
+from subprocess import run, PIPE
+
+
+def proc_type():
+    """Obtain the model processor on a Linux system."""
+    cmd = "cat /proc/cpuinfo"
+    try:
+        lines = run(
+            cmd,
+            shell=True,
+            check=True,
+            stdout=PIPE
+        ).stdout.decode('utf-8').split('\n')
+    except ChildProcessError:
+        return ""
+
+    for line in lines:
+        if "model name" in line:
+            return re.sub(".*model name.*:", "", line, 1)
+    return ""

tests/integration_tests/build/test_coverage.py

@@ -18,8 +18,16 @@
 import pytest
 
 import host_tools.cargo_build as host  # pylint: disable=import-error
+import host_tools.proc as proc
+
+# AMD has a slightly different coverage due to
+# the appearance of the brand string. On Intel,
+# this contains the frequency while on AMD it does not.
+# Checkout the cpuid crate. In the future other
+# differences may appear.
+COVERAGE_DICT = {"Intel": 84.90, "AMD": 84.84}
+PROC_MODEL = proc.proc_type()
 
-COVERAGE_TARGET_PCT = 84.90
 COVERAGE_MAX_DELTA = 0.05
 
 CARGO_KCOV_REL_PATH = os.path.join(host.CARGO_BUILD_REL_PATH, 'kcov')
@@ -45,6 +53,9 @@ def test_coverage(test_session_root_path, test_session_tmp_path):
     The result is extracted from the $KCOV_COVERAGE_FILE file created by kcov
     after a coverage run.
     """
+    proc_model = [item for item in COVERAGE_DICT if item in PROC_MODEL]
+    assert len(proc_model) == 1, "Could not get processor model!"
+    coverage_target_pct = COVERAGE_DICT[proc_model[0]]
     exclude_pattern = (
         '${CARGO_HOME:-$HOME/.cargo/},'
         'build/,'
@@ -87,22 +98,22 @@ def test_coverage(test_session_root_path, test_session_tmp_path):
 
     coverage_low_msg = (
         'Current code coverage ({:.2f}%) is below the target ({}%).'
-        .format(coverage, COVERAGE_TARGET_PCT)
+        .format(coverage, coverage_target_pct)
     )
 
-    min_coverage = COVERAGE_TARGET_PCT - COVERAGE_MAX_DELTA
+    min_coverage = coverage_target_pct - COVERAGE_MAX_DELTA
     assert coverage >= min_coverage, coverage_low_msg
 
     # Get the name of the variable that needs updating.
     namespace = globals()
     cov_target_name = [name for name in namespace if namespace[name]
-                       is COVERAGE_TARGET_PCT][0]
+                       is COVERAGE_DICT][0]
 
     coverage_high_msg = (
         'Current code coverage ({:.2f}%) is above the target ({}%).\n'
         'Please update the value of {}.'
-        .format(coverage, COVERAGE_TARGET_PCT, cov_target_name)
+        .format(coverage, coverage_target_pct, cov_target_name)
     )
 
-    assert coverage - COVERAGE_TARGET_PCT <= COVERAGE_MAX_DELTA,\
+    assert coverage - coverage_target_pct <= COVERAGE_MAX_DELTA,\
         coverage_high_msg