Fix ep 3 dockerfile test

Author: connoraird

.devcontainer/Dockerfile

@@ -5,13 +5,16 @@ FROM mcr.microsoft.com/vscode/devcontainers/base:$DEBIAN_VERSION
 RUN apt update
 RUN apt upgrade -y
 RUN apt install -y --no-install-recommends \
-gfortran git wget cmake python3-pip m4 openmpi-bin openmpi-doc libopenmpi-dev 
+gfortran git wget cmake python3-pip m4 openmpi-bin openmpi-doc libopenmpi-dev python3.11-venv
 RUN apt clean && rm -rf /var/lib/apt/lists/*
 
 # Install fpm
 RUN wget -O /usr/bin/fpm https://github.com/fortran-lang/fpm/releases/download/v0.10.1/fpm-0.10.1-linux-x86_64 && chmod 555 /usr/bin/fpm
 RUN apt update && apt install -y locales && rm -rf /var/lib/apt/lists/* && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 
+# Create symlink to python3
+RUN ln -s /usr/bin/python3 /usr/bin/python
+
 # Allow MPI to oversubscribe
 ENV OMPI_MCA_rmaps_base_oversubscribe=true
 

docker/Dockerfile.ep-3

@@ -6,26 +6,52 @@ COPY --chown=vscode episodes/3-writing-your-first-unit-test /home/vscode/3-writi
 
 WORKDIR /home/vscode/3-writing-your-first-unit-test/challenge
 
-# Rebuild without pFUnit
+# Build with CMake
 RUN cmake -B build-std && \
     cmake --build build-std
 
-# Test without pFUnit
+# Test with CMake
 RUN ctest --test-dir build-std --output-on-failure
 
+# Build with Make
+RUN FC=/usr/bin/f95 make tests
+
+# Test with Make
+RUN ./build/standard_fortran_tests
 
-# Test the Solution code
 
-# Cleanup directories
-RUN rm -rf build-std build-pf
+# Test the Solution code
 
 # Copy solution code
-RUN cp ../solution/test_temp_conversions.f90 test/standard_fortran/ && \
-    cp ../solution/test_temp_conversions.pf test/pfunit/
+RUN cp ../solution/standard_fortran/test_temp_conversions.f90 test/standard_fortran/test_temp_conversions.f90 && \
+    cp ../solution/pfunit/* test/pfunit/
+
+# Build with make
+
+# Uncomment pfunit comments
+RUN sed -i -E 's/tests: standard_fortran_tests \#\| pfunit_tests/tests: standard_fortran_tests \| pfunit_tests/g' Makefile
+RUN sed -i -E 's/clean: \#clean_pfunit/clean: clean_pfunit/g' Makefile
+
+# Clean up anything from the previous builds
+RUN make clean
+RUN rm -rf build-std
+
+# Build
+RUN FC=/usr/bin/f95 PFUNIT_SOURCE_DIR=/home/vscode/pfunit make tests
+
+# Run pFUnit tests
+RUN ./test/pfunit/tests
+
+# Run standard_fortran tests
+RUN ./build/standard_fortran_tests
+
+# Run cleanup again
+RUN make clean
+
 
-RUN ls test/pfunit/
+# Build with CMake
 
-# Rebuild without pFUnit
+# Build without pFUnit
 RUN cmake -B build-std && \
     cmake --build build-std
 

episodes/3-writing-your-first-unit-test/challenge/Makefile

@@ -1,6 +1,6 @@
 # Top level variables
 ROOT_DIR = $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-FC = gfortran
+FC ?= gfortran
 
 #------------------------------------#
 #      Targets for compiling src     #

episodes/3-writing-your-first-unit-test/challenge/test/standard_fortran/Makefile

@@ -6,7 +6,7 @@ $(BUILD_DIR)/%.o: $(STANDARD_FORTRAN_TEST_DIR)/%.f90 | $(BUILD_DIR)
 	$(FC) -c -J $(BUILD_DIR) -o $@ $<
 
 # Build test executable
-$(STANDARD_FORTRAN_TEST_EXE): $(TEST_OBJS) | $(SRC_OBJS)
-	$(FC) -o $@ $^
+$(STANDARD_FORTRAN_TEST_EXE): $(TEST_OBJS) $(SRC_OBJS)
+	$(FC) -o $@ $?
 
 tests: $(STANDARD_FORTRAN_TEST_EXE)

episodes/3-writing-your-first-unit-test/solution/pfunit/Makefile

@@ -1,8 +1,12 @@
-PFUNIT_SOURCE_DIR = $(ROOT_DIR)/../../../pfunit
-PFUNIT_INCLUDE_DIR = $(PFUNIT_SOURCE_DIR)/build/installed/PFUNIT-4.12/include
-include $(PFUNIT_INCLUDE_DIR)/PFUNIT.mk
+PFUNIT_SOURCE_DIR ?= $(ROOT_DIR)/../../../pfunit
+PFUNIT_VERSION ?= 4.12
+PFUNIT_INCLUDE_DIR = $(PFUNIT_SOURCE_DIR)/build/installed/PFUNIT-$(PFUNIT_VERSION)/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)
+endif
 
 # Define variables to be picked up by make_pfunit_test
 tests_TESTS = \