Move verification components to separate build.

FAIG2014 · Nov 8, 2018 · aa03ed3 · aa03ed3
1 parent 013f331
commit aa03ed3
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -34,6 +34,9 @@ environment:
     - BUILD_NAME: py36-acceptance-ghdl
       PYTHON: "C:\\Python36"
 
+    - BUILD_NAME: py36-vcomponents-ghdl
+      PYTHON: "C:\\Python36"
+
 install:
   - "git submodule update --init --recursive"
   - "%PYTHON%\\python.exe -m pip install tox"

diff --git a/.travis.yml b/.travis.yml
@@ -17,6 +17,8 @@ matrix:
     python: '3.5'
   - env: BUILD_NAME=py36-unit
     python: '3.6'
+  - env: BUILD_NAME=py36-unit
+    python: '3.6'
 
   - env: BUILD_NAME=py27-lint
     python: '2.7'
@@ -69,6 +71,27 @@ matrix:
     - cd ../../
     - export PATH=$PATH:install-ghdl-llvm/bin/
 
+  # Python 3.6 with ghdl llvm
+  - env: BUILD_NAME=py36-vcomponents-ghdl
+    python: '3.6'
+    os: linux
+    sudo: required
+    dist: trusty
+    before_install:
+    - sudo apt-get update -qq
+    - sudo apt-get install -y gnat-4.8 zlib1g-dev
+    - sudo apt-get install -y llvm-3.5-dev llvm-3.5-tools libedit-dev
+    before_script:
+    - git clone --depth 1 https://github.com/tgingold/ghdl.git ghdl
+    - cd ghdl
+    - mkdir build-llvm
+    - cd build-llvm
+    - ../configure --prefix=../../install-ghdl-llvm/ --with-llvm-config=llvm-config-3.5
+    - make
+    - make install
+    - cd ../../
+    - export PATH=$PATH:install-ghdl-llvm/bin/
+
   # Deploy to GitHub pages
   - stage: deploy
     python: '3.6'

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,34,35,36}-unit, py{27,34,35,36}-acceptance-{activehdl,ghdl,modelsim,rivierapro}, py{27,35,36}-lint, py{27,35,36}-docs
+envlist = py{27,34,35,36}-unit, py{27,34,35,36}-acceptance-{activehdl,ghdl,modelsim,rivierapro}, py{27,34,35,36,37}-vcomponents-{activehdl,ghdl,modelsim,rivierapro}, py{27,35,36,37}-lint, py{27,35,36,37}-docs
 skip_missing_interpreters = True
 
 [testenv]
@@ -23,7 +23,8 @@ setenv=
     acceptance-rivierapro: VUNIT_SIMULATOR=rivierapro
 
 commands=
-    unit:       {envpython} -m pytest -v vunit/test/unit
-    acceptance: {envpython} -m pytest -v vunit/test/acceptance
-    lint:       {envpython} -m pytest -v vunit/test/lint
-    docs:       {envpython} tools/build_docs.py {envtmpdir}/docsbuild
+    unit:        {envpython} -m pytest -v vunit/test/unit
+    lint:        {envpython} -m pytest -v vunit/test/lint
+    docs:        {envpython} tools/build_docs.py {envtmpdir}/docsbuild
+    acceptance:  {envpython} -m pytest -v vunit/test/acceptance
+    vcomponents: {envpython} vunit/vhdl/verification_components/run.py --clean
diff --git a/vunit/test/acceptance/test_external_run_scripts.py b/vunit/test/acceptance/test_external_run_scripts.py
@@ -151,9 +151,6 @@ def test_data_types_vhdl_93(self):
     def test_random_vhdl_2008(self):
         self.check(join(VHDL_PATH, "random", "run.py"))
 
-    def test_verification_components_vhdl_2008(self):
-        self.check(join(VHDL_PATH, "verification_components", "run.py"))
-
     def test_check_vhdl_2008(self):
         self.check(join(VHDL_PATH, "check", "run.py"))