Merge pull request #509 from srz-zumix/feature/zapcc_with_python2

zapcc with python test
srz-zumix · Sep 20, 2020 · a8aed36 · a8aed36
2 parents 0537085 + 3aade96
commit a8aed36
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -67,14 +67,21 @@ jobs:
     runs-on: ubuntu-18.04
     container: docker://srzzumix/zapcc
     needs: prepare
+    env:
+      PYTHON_VERSION: 3.8
     steps:
     - uses: actions/checkout@master
+    - uses: actions/setup-python@v2
+      with:
+        python-version: ${{ env.PYTHON_VERSION }}
+    - name: Set Python environment variable
+      run: echo '::set-env name=LD_LIBRARY_PATH::${{ env.pythonLocation }}/lib'
     - name: zapcc test
       run: |
         make -C test clean
         make -C test showcxxversion
         make -C test check_stdlib
-        make -C test -j1
+        make -C test -j1 IUTEST_REQUIRE_PYTHON=1
         make -C test test
   arm-none-eabi:
     runs-on: ubuntu-18.04

diff --git a/tools/python/iutest_compile_error_test.py b/tools/python/iutest_compile_error_test.py
@@ -545,7 +545,7 @@ def parse_output(options):
         f = options.infile
         #f = codecs.getreader('utf-8')(options.infile)
 
-    if any(options.compiler.find(s) != -1 for s in ('clang', 'clang++')):
+    if any(options.compiler.find(s) != -1 for s in ('clang', 'clang++', 'zapcc', 'zapcc++')):
         l = parse_clang(options, f)
     elif any(options.compiler.find(s) != -1 for s in ('gcc', 'g++')):
         l = parse_gcc(options, f)