From 73328e06c178e4b7a0d90ff51ef8ab52a6ff7f4b Mon Sep 17 00:00:00 2001
From: Karol Gugala <kgugala@antmicro.com>
Date: Sun, 22 Nov 2020 19:00:49 +0100
Subject: [PATCH 1/2] Rework in docker tests so they handle comments

Signed-off-by: Karol Gugala <kgugala@antmicro.com>
---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2c85c9b..53cceb5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ before_install:
  # Get tuttest and setup a docker container to run the test in.
  - pip install git+https://github.com/antmicro/tuttest#egg=tuttest
  - 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
        --name $DOCKER_NAME
        --env LANG="en_US.UTF-8"
@@ -49,11 +49,11 @@ install:
  # Check the top level README file is up to date.
  - rm README.rst && make README.rst && .github/travis/git-check.sh
  # Install the toolchain into the docker container.
- - tuttest README.rst install-wget-${OS} --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex -
- - tuttest README.rst wget-conda --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex -
- - tuttest ${TOOLCHAIN}/README.rst ${TOOLCHAIN}-setup-toolchain --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 | ${IN_DOCKER_EXEC} "$(cat /dev/stdin)"
+ - tuttest ${TOOLCHAIN}/README.rst ${TOOLCHAIN}-setup-toolchain | ${IN_DOCKER_EXEC} "$(cat /dev/stdin)"
 
 script:
  # Run the tests inside the docker container.
  - 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)"

From f6fcb87cc5efe7b54fe22382a7d61ca02d79b106 Mon Sep 17 00:00:00 2001
From: Karol Gugala <kgugala@antmicro.com>
Date: Sun, 22 Nov 2020 22:34:19 +0100
Subject: [PATCH 2/2] xc7: do not use one-top-level option

This option is not supported in older distros we test.
We need to manually create the directory to which we're
going to unpack architectures definitions.

Signed-off-by: Karol Gugala <kgugala@antmicro.com>
---
 README.rst     | 3 ++-
 xc7/README.rst | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index b6bc684..5e4fe88 100644
--- a/README.rst
+++ b/README.rst
@@ -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"
         conda env create -f xc7/environment.yml
         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
 
 * For the EOS S3 devices:
diff --git a/xc7/README.rst b/xc7/README.rst
index 1864052..5941d29 100644
--- a/xc7/README.rst
+++ b/xc7/README.rst
@@ -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"
         conda env create -f xc7/environment.yml
         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
 
 .. toolchain_include_end_label