Add Make to ep 6 tests, instructions and solutions

Author: connoraird

docker/Dockerfile.ep-6

@@ -6,19 +6,27 @@ WORKDIR /home/vscode/6-testing-parallel-code/challenge
 
 # Fix intentional bug in code
 RUN mv ../solution/test_find_steady_state.pf ./test/ && \
-    echo "set(test_find_steady_state_src \${test_srcs})\n\
-list(FILTER test_find_steady_state_src INCLUDE REGEX \".*test_find_steady_state.pf\")\n\
-\n\
-add_pfunit_ctest (pfunit_find_steady_state_tests\n\
-    TEST_SOURCES \${test_find_steady_state_src}\n\
+    echo "add_pfunit_ctest (pfunit_find_steady_state_tests\n\
+    TEST_SOURCES \"\${PROJECT_SOURCE_DIR}/test/test_find_steady_state.pf\"\n\
     LINK_LIBRARIES sut\n\
     MAX_PES 8\n\
     )\n\
-" >> test/CMakeLists.txt
+" >> test/CMakeLists.txt && \
+    sed -i -E 's/TEST_FLAGS = -I\$\(BUILD_DIR\) \$\(PFUNIT_EXTRA_FFLAGS\)/TEST_FLAGS = -I\$\(BUILD_DIR\) \$\(PFUNIT_EXTRA_FFLAGS\) -lpfunit/g' test/Makefile && \
+    sed -i -E 's/test_get_local_grid_info.pf/test_get_local_grid_info.pf \\\n  test_find_steady_state.pf/g' test/Makefile
 
 # build tests with cmake
 RUN cmake -B build-cmake -DCMAKE_PREFIX_PATH=/home/vscode/pfunit/build/installed && \
     cmake --build build-cmake
 
 # test with ctest, allowing MPI to oversubscribe
 RUN ctest --test-dir build-cmake --output-on-failure
+
+# Remove any generated code
+RUN make clean
+
+# Build tests with make
+RUN make tests
+
+# Run make tests
+RUN mpirun -np 8 ./test/tests

episodes/6-testing-parallel-code/challenge/Makefile

@@ -1,6 +1,6 @@
 # Top level variables
 ROOT_DIR = $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-FC ?= mpif90
+FC := mpif90 -ffree-line-length-none
 
 #------------------------------------#
 #      Targets for compiling src     #

episodes/6-testing-parallel-code/challenge/README.md

@@ -31,5 +31,7 @@ There are some examples of parallel tests in [test_exchange_boundaries.pf](./tes
 1. Re-write test_find_steady_state.pf so that it uses the pfunit library instead of funit. We need to make sure that the subroutine
    find_steady_state reaches steady state within the same number of generations as its serial version.
 
-2. Make sure your test automatically runs across different numbers of ranks via ctest. You will need to make changes in
-   [CMakeLists.txt](./CMakeLists.txt) as well as within the test itself.
+2. Add your new test to the existing build systems
+   i. Update the [test/Makefile](./test/Makefile) to allow building MPI enabled pFUnit tests and build your new test with make.
+   ii. Make sure your test automatically runs across different numbers of ranks via ctest. You will need to make changes in
+       [CMakeLists.txt](./CMakeLists.txt) as well as within the test itself.

episodes/6-testing-parallel-code/challenge/test/CMakeLists.txt

@@ -59,7 +59,4 @@ add_pfunit_ctest (pfunit_exchange_boundaries_tests
   )
 
 # find_steady_state tests
-add_pfunit_ctest (pfunit_find_steady_state_tests
-  TEST_SOURCES "${PROJECT_SOURCE_DIR}/test/test_find_steady_state.pf"
-  LINK_LIBRARIES sut # your application library
-  )
+# Your changes here...

episodes/6-testing-parallel-code/challenge/test/Makefile

@@ -1,4 +1,4 @@
-PFUNIT_INCLUDE_DIR ?= /home/vscode/pfunit/build/installed/PFUNIT-4.12/include
+PFUNIT_INCLUDE_DIR := /home/vscode/pfunit/build/installed/PFUNIT-4.12/include
 
 # Don't try to include if we're cleaning as this doesn't depend on pFUnit
 ifneq ($(MAKECMDGOALS),clean)
@@ -12,7 +12,6 @@ check:
 # Define variables to be picked up by make_pfunit_test
 tests_TESTS = \
   test_evolve_board.pf \
-  test_find_steady_state.pf \
   test_read_model_from_file.pf \
   test_check_for_steady_state.pf \
   test_exchange_boundaries.pf \

episodes/6-testing-parallel-code/solution/README.md

@@ -10,36 +10,21 @@ that of the parallel solution.
 
 ## Task 2
 
-> Ensure your test can be compiled using Make.
-
-To compile MPI enabled pFUnit tests via Make you must ensure you include `-lpfunit` in the test flags,
-
-```diff
---- a/episodes/6-testing-parallel-code/challenge/test/Makefile
-+++ b/episodes/6-testing-parallel-code/challenge/test/Makefile
-@@ -3,7 +3,7 @@ PFUNIT_INCLUDE_DIR ?= /home/vscode/pfunit/build/installed/PFUNIT-4.12/include
- # Don't try to include if we're cleaning as this doesn't depend on pFUnit
- ifneq ($(MAKECMDGOALS),clean)
- include $(PFUNIT_INCLUDE_DIR)/PFUNIT.mk
--TEST_FLAGS = -I$(BUILD_DIR) $(PFUNIT_EXTRA_FFLAGS)
-+TEST_FLAGS = -I$(BUILD_DIR) $(PFUNIT_EXTRA_FFLAGS) -lpfunit
- endif
- 
- check:
-```
+> i. Update the [test/Makefile](./test/Makefile) to allow building MPI enabled pFUnit tests and build your new test with make.
+
+To compile MPI enabled pFUnit tests via Make you must ensure you include `-lpfunit` in the **TEST_FLAGS** and add your new test to
+the list **tests_TESTS**.
 
-> Make sure your test automatically runs across different numbers of ranks via ctest.
+> ii. Make sure your test automatically runs across different numbers of ranks via ctest. You will need to make changes in
+> [CMakeLists.txt](./CMakeLists.txt) as well as within the test itself.
 
 In order to run this parallel solution with different numbers of MPI ranks via ctest, you will also need to update CMakeLists.txt
-with the following change.
-
-```diff
---- a/episodes/6-testing-parallel-code/challenge/test/CMakeLists.txt
-+++ b/episodes/6-testing-parallel-code/challenge/test/CMakeLists.txt
-@@ -62,4 +62,5 @@ add_pfunit_ctest (pfunit_exchange_boundaries_tests
- add_pfunit_ctest (pfunit_find_steady_state_tests
-   TEST_SOURCES "${PROJECT_SOURCE_DIR}/test/test_find_steady_state.pf"
-   LINK_LIBRARIES sut # your application library
-+  MAX_PES 8
-   )
+to add the following.
+
+```cmake
+add_pfunit_ctest (pfunit_find_steady_state_tests
+  TEST_SOURCES "${PROJECT_SOURCE_DIR}/test/test_find_steady_state.pf"
+  LINK_LIBRARIES sut # your application library
+  MAX_PES 8
+)
 ```