Skip to content

Commit 8a2017f

Browse files
committed
[toolchain] Set working directory for running tests
Signed-off-by: Michael Brown <mbrown@fensystems.co.uk>
1 parent c1a58d0 commit 8a2017f

1 file changed

Lines changed: 28 additions & 14 deletions

File tree

toolchain/Dockerfile

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,13 @@ ENV JOBS=${JOBS}
4040

4141
ADD https://github.com/ipxe/ipxe.git /ipxe
4242

43-
CMD make -C /ipxe/src -j ${JOBS} \
43+
WORKDIR /ipxe/src
44+
45+
CMD make -j ${JOBS} \
4446
bin-x86_64-pcbios/intel.mrom bin-x86_64-pcbios/ipxe.iso \
4547
bin-x86_64-efi/snponly.efi bin-x86_64-efi/ipxe.iso \
4648
bin-x86_64-linux/tests.linux bin-x86_64-linux/errors && \
47-
valgrind /ipxe/src/bin-x86_64-linux/tests.linux
49+
valgrind ./bin-x86_64-linux/tests.linux
4850

4951
#
5052
# i386 toolchain
@@ -66,11 +68,13 @@ ENV JOBS=${JOBS}
6668

6769
ADD https://github.com/ipxe/ipxe.git /ipxe
6870

69-
CMD make -C /ipxe/src -j ${JOBS} \
71+
WORKDIR /ipxe/src
72+
73+
CMD make -j ${JOBS} \
7074
bin/intel.mrom bin/ipxe.iso \
7175
bin-i386-efi/snponly.efi bin-i386-efi/ipxe.iso \
7276
bin-i386-linux/tests.linux bin-i386-linux/errors && \
73-
valgrind /ipxe/src/bin-i386-linux/tests.linux
77+
valgrind ./bin-i386-linux/tests.linux
7478

7579
#
7680
# arm64 toolchain
@@ -96,10 +100,12 @@ ENV JOBS=${JOBS}
96100

97101
ADD https://github.com/ipxe/ipxe.git /ipxe
98102

99-
CMD make -C /ipxe/src -j ${JOBS} \
103+
WORKDIR /ipxe/src
104+
105+
CMD make -j ${JOBS} \
100106
bin-arm64-efi/snponly.efi bin-arm64-efi/ipxe.iso \
101107
bin-arm64-linux/tests.linux bin-arm64-linux/errors && \
102-
qemu-aarch64-static /ipxe/src/bin-arm64-linux/tests.linux
108+
qemu-aarch64-static ./bin-arm64-linux/tests.linux
103109

104110
#
105111
# arm32 toolchain
@@ -125,10 +131,12 @@ ENV JOBS=${JOBS}
125131

126132
ADD https://github.com/ipxe/ipxe.git /ipxe
127133

128-
CMD make -C /ipxe/src -j ${JOBS} \
134+
WORKDIR /ipxe/src
135+
136+
CMD make -j ${JOBS} \
129137
bin-arm32-efi/snponly.efi bin-arm32-efi/ipxe.iso \
130138
bin-arm32-linux/tests.linux bin-arm32-linux/errors && \
131-
qemu-arm-static /ipxe/src/bin-arm32-linux/tests.linux
139+
qemu-arm-static ./bin-arm32-linux/tests.linux
132140

133141
#
134142
# loong64 toolchain
@@ -154,10 +162,12 @@ ENV JOBS=${JOBS}
154162

155163
ADD https://github.com/ipxe/ipxe.git /ipxe
156164

157-
CMD make -C /ipxe/src -j ${JOBS} \
165+
WORKDIR /ipxe/src
166+
167+
CMD make -j ${JOBS} \
158168
bin-loong64-efi/snponly.efi bin-loong64-efi/ipxe.iso \
159169
bin-loong64-linux/tests.linux bin-loong64-linux/errors && \
160-
qemu-loongarch64-static /ipxe/src/bin-loong64-linux/tests.linux
170+
qemu-loongarch64-static ./bin-loong64-linux/tests.linux
161171

162172
#
163173
# riscv64 toolchain
@@ -183,11 +193,13 @@ ENV JOBS=${JOBS}
183193

184194
ADD https://github.com/ipxe/ipxe.git /ipxe
185195

186-
CMD make -C /ipxe/src -j ${JOBS} \
196+
WORKDIR /ipxe/src
197+
198+
CMD make -j ${JOBS} \
187199
bin-riscv64/ipxe.sbi \
188200
bin-riscv64-efi/snponly.efi bin-riscv64-efi/ipxe.iso \
189201
bin-riscv64-linux/tests.linux bin-riscv64-linux/errors && \
190-
qemu-riscv64-static /ipxe/src/bin-riscv64-linux/tests.linux
202+
qemu-riscv64-static ./bin-riscv64-linux/tests.linux
191203

192204
#
193205
# riscv32 toolchain
@@ -210,11 +222,13 @@ ENV JOBS=${JOBS}
210222

211223
ADD https://github.com/ipxe/ipxe.git /ipxe
212224

213-
CMD make -C /ipxe/src -j ${JOBS} \
225+
WORKDIR /ipxe/src
226+
227+
CMD make -j ${JOBS} \
214228
bin-riscv32/ipxe.sbi \
215229
bin-riscv32-efi/snponly.efi bin-riscv32-efi/ipxe.iso \
216230
bin-riscv32-linux/tests.linux bin-riscv32-linux/errors && \
217-
qemu-riscv32-static /ipxe/src/bin-riscv32-linux/tests.linux
231+
qemu-riscv32-static ./bin-riscv32-linux/tests.linux
218232

219233
#
220234
# Specify the default target

0 commit comments

Comments
 (0)