Hardware
/
f4pga-examples
mirror of https://github.com/chipsalliance/f4pga-examples.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #67 from antmicro/fix-xc7-build 

Rework in-docker tests so they handle comments in scripts
This commit is contained in:
Peter Gielda 2020-11-23 00:15:29 +01:00 committed by GitHub
parent cef42ad8ff f6fcb87cc5
commit de551c7b20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -32,7 +32,7 @@ before_install:
# Get tuttest and setup a docker container to run the test in. # Get tuttest and setup a docker container to run the test in.
- pip install git+https://github.com/antmicro/tuttest#egg=tuttest - pip install git+https://github.com/antmicro/tuttest#egg=tuttest
- export DOCKER_NAME=test - export DOCKER_NAME=test
- export IN_DOCKER_EXEC="docker exec -t $DOCKER_NAME bash -c" - export IN_DOCKER_EXEC="docker exec -t $DOCKER_NAME bash -ex -c"
- docker create - docker create
--name $DOCKER_NAME --name $DOCKER_NAME
--env LANG="en_US.UTF-8" --env LANG="en_US.UTF-8"
@ -49,11 +49,11 @@ install:
# Check the top level README file is up to date. # Check the top level README file is up to date.
- rm README.rst && make README.rst && .github/travis/git-check.sh - rm README.rst && make README.rst && .github/travis/git-check.sh
# Install the toolchain into the docker container. # Install the toolchain into the docker container.
- tuttest README.rst install-wget-${OS} --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex - - tuttest README.rst install-wget-${OS} | ${IN_DOCKER_EXEC} "$(cat /dev/stdin)"
- tuttest README.rst wget-conda --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex - - tuttest README.rst wget-conda | ${IN_DOCKER_EXEC} "$(cat /dev/stdin)"
- tuttest ${TOOLCHAIN}/README.rst ${TOOLCHAIN}-setup-toolchain --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex - - tuttest ${TOOLCHAIN}/README.rst ${TOOLCHAIN}-setup-toolchain | ${IN_DOCKER_EXEC} "$(cat /dev/stdin)"
script: script:
# Run the tests inside the docker container. # Run the tests inside the docker container.
- if [ "$TOOLCHAIN" = "xc7" ]; then EXTRA_TESTS=,xc7-picosoc,xc7-litex,xc7-linux; fi - if [ "$TOOLCHAIN" = "xc7" ]; then EXTRA_TESTS=,xc7-picosoc,xc7-litex,xc7-linux; fi
- tuttest ${TOOLCHAIN}/README.rst ${TOOLCHAIN}-prepare-env,${TOOLCHAIN}-counter${EXTRA_TESTS} --prefix-lines-with "$IN_DOCKER_EXEC" --single-command | bash -ex - - tuttest ${TOOLCHAIN}/README.rst ${TOOLCHAIN}-prepare-env,${TOOLCHAIN}-counter${EXTRA_TESTS} | ${IN_DOCKER_EXEC} "$(cat /dev/stdin)"

3
README.rst
View File

@ -89,7 +89,8 @@ and so you will need to add some ``sudo`` commands to the instructions below.
source "$INSTALL_DIR/xc7/conda/etc/profile.d/conda.sh" source "$INSTALL_DIR/xc7/conda/etc/profile.d/conda.sh"
conda env create -f xc7/environment.yml conda env create -f xc7/environment.yml
conda activate xc7 conda activate xc7
wget -qO- https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/66/20200914-111752/symbiflow-arch-defs-install-05d68df0.tar.xz | tar -xJ --one-top-level=$INSTALL_DIR/xc7/install mkdir -p $INSTALL_DIR/xc7/install
wget -qO- https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/66/20200914-111752/symbiflow-arch-defs-install-05d68df0.tar.xz | tar -xJC $INSTALL_DIR/xc7/install
conda deactivate conda deactivate
* For the EOS S3 devices: * For the EOS S3 devices:

3
xc7/README.rst
View File

@ -41,7 +41,8 @@ Choose the installation directory (see the `README <../README.rst>`_ one level u
source "$INSTALL_DIR/xc7/conda/etc/profile.d/conda.sh" source "$INSTALL_DIR/xc7/conda/etc/profile.d/conda.sh"
conda env create -f xc7/environment.yml conda env create -f xc7/environment.yml
conda activate xc7 conda activate xc7
wget -qO- https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/66/20200914-111752/symbiflow-arch-defs-install-05d68df0.tar.xz | tar -xJ --one-top-level=$INSTALL_DIR/xc7/install mkdir -p $INSTALL_DIR/xc7/install
wget -qO- https://storage.googleapis.com/symbiflow-arch-defs/artifacts/prod/foss-fpga-tools/symbiflow-arch-defs/continuous/install/66/20200914-111752/symbiflow-arch-defs-install-05d68df0.tar.xz | tar -xJC $INSTALL_DIR/xc7/install
conda deactivate conda deactivate
.. toolchain_include_end_label .. toolchain_include_end_label