Re-enable NVC in CI

Author: LarsAsplund

.github/workflows/push.yml

@@ -98,27 +98,27 @@ jobs:
 # Docker (Linux) tests (NVC)
 #
 
-# nvc:
-#   runs-on: ubuntu-latest
-#   strategy:
-#     fail-fast: false
-#     matrix:
-#       task: [
-#         {do: 311-acceptance},
-#         {do: 311-vcomponents},
-#       ]
-#   name: '🛳️ Container · ${{ matrix.task.do }} · NVC'
-#   steps:
-
-#   - name: '🧰 Checkout'
-#     uses: actions/checkout@v4
-#     with:
-#       submodules: recursive
-
-#   - name: '🚧 Run job'
-#     uses: docker://ghcr.io/vunit/dev/nvc
-#     with:
-#       args: tox -e py${{ matrix.task.do }}-nvc
+  nvc:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        task: [
+          {do: 311-acceptance},
+          {do: 311-vcomponents},
+        ]
+    name: '🛳️ Container · ${{ matrix.task.do }} · NVC'
+    steps:
+
+    - name: '🧰 Checkout'
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: '🚧 Run job'
+      uses: docker://ghcr.io/vunit/dev/nvc
+      with:
+        args: tox -e py${{ matrix.task.do }}-nvc
 
 #
 # Windows (MSYS2) with 'nightly' GHDL
@@ -175,7 +175,7 @@ jobs:
       - fmt
       - lin
       - ghdl
-#      - nvc
+      - nvc
       - win
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
     name: '🚀 Deploy'

tests/common.py

@@ -15,13 +15,25 @@
 import os
 import shutil
 import random
+import re
 
 
 def check_report(report_file, tests=None):
     """
     Check an XML report_file for the exact occurrence of specific test results
     """
-    tree = ElementTree.parse(report_file)
+
+    xml_report = Path(report_file).read_text()
+    illegal_xml_re = re.compile(r"[\x00-\x08\x0B\x0C\x0E-\x1F]")
+    xml_report = illegal_xml_re.sub("", xml_report)
+    Path(report_file).write_text(xml_report)
+
+    try:
+        tree = ElementTree.parse(report_file)
+    except ElementTree.ParseError:
+        print(f"Failed to parse XML report file {report_file}, content:\n{xml_report}")
+        raise
+
     root = tree.getroot()
     report = {}
     for test in root.iter("testcase"):