Skip to content

Commit f79e6bf

Browse files
committed
Revert "Move pfunit build to /pfunit"
This reverts commit b1aeec6.
1 parent b1aeec6 commit f79e6bf

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ WORKDIR /home/vscode/
2121

2222
# Build pfunit
2323
COPY scripts/build-pfunit.sh /home/vscode/build-pfunit.sh
24-
RUN /home/vscode/build-pfunit.sh -b -p /pfunit
24+
RUN /home/vscode/build-pfunit.sh -b -p /home/vscode/pfunit
2525

2626
# Test pFUnit build
27-
RUN /home/vscode/build-pfunit.sh -t -p /pfunit
27+
RUN /home/vscode/build-pfunit.sh -t -p /home/vscode/pfunit

docker/Dockerfile.ep-3

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ WORKDIR /home/vscode/3-fortran-unit-test-syntax/solution
88
RUN sed -i -E 's/.*add_subdirectory\(\"test\/test-drive\"\)/#add_subdirectory\(\"test\/test-drive\"\)/g' CMakeLists.txt && \
99
sed -i -E 's/.*add_subdirectory\(\"test\/pfunit\"\)/#add_subdirectory\(\"test\/pfunit\"\)/g' CMakeLists.txt && \
1010
sed -i -E 's/.*add_subdirectory\(\"test\/veggies\"\)/add_subdirectory\(\"test\/veggies\"\)/g' CMakeLists.txt && \
11-
cmake -B build-cmake-veggies -DCMAKE_PREFIX_PATH=/pfunit/build/installed && \
11+
cmake -B build-cmake-veggies -DCMAKE_PREFIX_PATH=/home/vscode/pfunit/build/installed && \
1212
cmake --build build-cmake-veggies
1313

1414
# build tests without veggies with cmake
1515
RUN sed -i -E 's/.*add_subdirectory\(\"test\/test-drive\"\)/add_subdirectory\(\"test\/test-drive\"\)/g' CMakeLists.txt && \
1616
sed -i -E 's/.*add_subdirectory\(\"test\/pfunit\"\)/add_subdirectory\(\"test\/pfunit\"\)/g' CMakeLists.txt && \
1717
sed -i -E 's/.*add_subdirectory\(\"test\/veggies\"\)/#add_subdirectory\(\"test\/veggies\"\)/g' CMakeLists.txt && \
18-
cmake -B build-cmake -DCMAKE_PREFIX_PATH=/pfunit/build/installed && \
18+
cmake -B build-cmake -DCMAKE_PREFIX_PATH=/home/vscode/pfunit/build/installed && \
1919
cmake --build build-cmake
2020

2121
# test veggies with ctest

docker/Dockerfile.ep-4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ RUN sed -i -E 's/.*matrix\(row, col\) = temp_matrix\(row, col\)/matrix\(col, row
1111
RUN sed -i -E 's/.*add_subdirectory\(\"test\/test-drive\"\)/#add_subdirectory\(\"test\/test-drive\"\)/g' CMakeLists.txt && \
1212
sed -i -E 's/.*add_subdirectory\(\"test\/pfunit\"\)/#add_subdirectory\(\"test\/pfunit\"\)/g' CMakeLists.txt && \
1313
sed -i -E 's/.*add_subdirectory\(\"test\/veggies\"\)/add_subdirectory\(\"test\/veggies\"\)/g' CMakeLists.txt && \
14-
cmake -B build-cmake-veggies -DCMAKE_PREFIX_PATH=/pfunit/build/installed && \
14+
cmake -B build-cmake-veggies -DCMAKE_PREFIX_PATH=/home/vscode/pfunit/build/installed && \
1515
cmake --build build-cmake-veggies
1616

1717
# build tests without veggies with cmake
1818
RUN sed -i -E 's/.*add_subdirectory\(\"test\/test-drive\"\)/add_subdirectory\(\"test\/test-drive\"\)/g' CMakeLists.txt && \
1919
sed -i -E 's/.*add_subdirectory\(\"test\/pfunit\"\)/add_subdirectory\(\"test\/pfunit\"\)/g' CMakeLists.txt && \
2020
sed -i -E 's/.*add_subdirectory\(\"test\/veggies\"\)/#add_subdirectory\(\"test\/veggies\"\)/g' CMakeLists.txt && \
21-
cmake -B build-cmake -DCMAKE_PREFIX_PATH=/pfunit/build/installed && \
21+
cmake -B build-cmake -DCMAKE_PREFIX_PATH=/home/vscode/pfunit/build/installed && \
2222
cmake --build build-cmake
2323

2424
# test veggies with ctest

docker/Dockerfile.ep-5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN mv ../solution/test_find_steady_state.pf ./test/ && \
99
sed -i -E 's/.*LINK_LIBRARIES sut.*/LINK_LIBRARIES sut MAX_PES 8/g' test/CMakeLists.txt
1010

1111
# build tests with cmake
12-
RUN cmake -B build-cmake -DCMAKE_PREFIX_PATH=/pfunit/build/installed && \
12+
RUN cmake -B build-cmake -DCMAKE_PREFIX_PATH=/home/vscode/pfunit/build/installed && \
1313
cmake --build build-cmake
1414

1515
# test with ctest, allowing MPI to oversubscribe

0 commit comments

Comments
 (0)