debian-bullseye/yosys: needs g++ for running tests

hdl · Sep 7, 2023 · bf4053f · bf4053f
1 parent d14f609
commit bf4053f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 0 deletions.
diff --git a/debian-bookworm/yosys/Dockerfile b/debian-bookworm/yosys/Dockerfile
@@ -33,6 +33,14 @@ RUN --mount=type=bind,target=/tmp/ctx . /tmp/ctx/HDLC \
 
 RUN --mount=type=bind,target=/tmp/ctx . /tmp/ctx/HDLC && build
 
+RUN --mount=type=bind,target=/tmp/ctx . /tmp/ctx/HDLC \
+ && apt-get update -qq \
+ && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends ${depends[@]} ${testdepends[@]} \
+ && apt-get autoclean && apt-get clean && apt-get -y autoremove \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN --mount=type=bind,target=/tmp/ctx . /tmp/ctx/HDLC && runtests
+
 #---
 
 FROM scratch AS pkg

diff --git a/debian-bookworm/yosys/HDLC b/debian-bookworm/yosys/HDLC
@@ -33,11 +33,19 @@ makedepends=(
   make
 )
 
+testdepends=(
+  g++
+)
+
 build() {
   git clone https://github.com/YosysHQ/yosys.git /tmp/yosys
   cd /tmp/yosys
   make -j $(nproc)
   make DESTDIR=/opt/yosys install
+}
+
+runtests() {
+  cd /tmp/yosys
   make test
 }
 

diff --git a/debian-bullseye/yosys/Dockerfile b/debian-bullseye/yosys/Dockerfile
@@ -33,6 +33,14 @@ RUN --mount=type=bind,target=/tmp/ctx . /tmp/ctx/HDLC \
 
 RUN --mount=type=bind,target=/tmp/ctx . /tmp/ctx/HDLC && build
 
+RUN --mount=type=bind,target=/tmp/ctx . /tmp/ctx/HDLC \
+ && apt-get update -qq \
+ && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends ${depends[@]} ${testdepends[@]} \
+ && apt-get autoclean && apt-get clean && apt-get -y autoremove \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN --mount=type=bind,target=/tmp/ctx . /tmp/ctx/HDLC && runtests
+
 #---
 
 FROM scratch AS pkg

diff --git a/debian-bullseye/yosys/HDLC b/debian-bullseye/yosys/HDLC
@@ -33,11 +33,19 @@ makedepends=(
   make
 )
 
+testdepends=(
+  g++
+)
+
 build() {
   git clone https://github.com/YosysHQ/yosys.git /tmp/yosys
   cd /tmp/yosys
   make -j $(nproc)
   make DESTDIR=/opt/yosys install
+}
+
+runtests() {
+  cd /tmp/yosys
   make test
 }