From 28e308a218a381d821763682c99359959888ad41 Mon Sep 17 00:00:00 2001 From: Lars Asplund Date: Fri, 19 Mar 2021 07:57:57 +0100 Subject: [PATCH] bump OSVVM to latest version (#712) This commits ignores files with VHDL-2019 features to make sure that the rest doesn't break anything. --- vunit/builtins.py | 18 +++++++++--------- vunit/vhdl/osvvm | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/vunit/builtins.py b/vunit/builtins.py index d0fc2b579..ae1cd3e98 100644 --- a/vunit/builtins.py +++ b/vunit/builtins.py @@ -173,16 +173,16 @@ def _add_osvvm(self): for file_name in glob(str(VHDL_PATH / "osvvm" / "*.vhd")): bname = Path(file_name).name + + if (bname == "AlertLogPkg_body_BVUL.vhd") or ("2019" in bname): + continue + if ( - bname == "AlertLogPkg_body_BVUL.vhd" - or ( - (simulator_coverage_api != "rivierapro") - and (bname == "VendorCovApiPkg_Aldec.vhd") - ) - or ( - (simulator_coverage_api == "rivierapro") - and (bname == "VendorCovApiPkg.vhd") - ) + (simulator_coverage_api != "rivierapro") + and (bname == "VendorCovApiPkg_Aldec.vhd") + ) or ( + (simulator_coverage_api == "rivierapro") + and (bname == "VendorCovApiPkg.vhd") ): continue diff --git a/vunit/vhdl/osvvm b/vunit/vhdl/osvvm index 185a11d7b..9251c74b5 160000 --- a/vunit/vhdl/osvvm +++ b/vunit/vhdl/osvvm @@ -1 +1 @@ -Subproject commit 185a11d7bbf896e5fb66035cbad7fcb5ab505c79 +Subproject commit 9251c74b5126132926238989ee9b4460e37abbce