Skip to content

Commit 94f4a0e

Browse files
committed
Fix ep 3 CI test to use ca=orrect path and reformat ep 2 CI test
1 parent deab2f3 commit 94f4a0e

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

docker/Dockerfile.ep-1

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@ COPY --chown=vscode episodes/1-into-to-unit-tests /home/vscode/1-into-to-unit-te
44

55
WORKDIR /home/vscode/1-into-to-unit-tests/challenge
66

7-
# test challenge with CMake
8-
RUN cmake -B build
9-
RUN cmake --build build
7+
# Build challenge's tests with cmake
8+
RUN cmake -B build && \
9+
cmake --build build
10+
# Run test with ctest
1011
RUN ctest --test-dir build --output-on-failure
1112

1213
# clean build
1314
RUN rm -rf build
1415

15-
# Test solution with CMake
16-
RUN mv ../solution/test_maths_solution.f90 test/test_maths.f90
17-
RUN cmake -B build
18-
RUN cmake --build build
16+
# Build solution's tests with cmake
17+
RUN mv ../solution/test_maths_solution.f90 test/test_maths.f90 && \
18+
cmake -B build && \
19+
cmake --build build
20+
# Run test with ctest
1921
RUN ctest --test-dir build --output-on-failure

docker/Dockerfile.ep-3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ RUN cmake -B build -DCMAKE_PREFIX_PATH=/home/vscode/pfunit/build/installed && \
99
cmake --build build
1010

1111
# test pfunit with ctest
12-
RUN ctest --test-dir build-cmake --output-on-failure
12+
RUN ctest --test-dir build --output-on-failure
1313

0 commit comments

Comments
 (0)