Run the testsuite for the build_upstream 32-bit target (oxcaml#811)

Author: mshinwell

.github/workflows/build.yml

@@ -128,7 +128,7 @@ jobs:
 
     - name: Install GCC 32-bit libraries
       if: matrix.name == 'build_upstream-32-bit'
-      run: sudo apt-get install gcc-multilib
+      run: sudo apt-get install gcc-multilib gfortran-multilib
 
     - name: Configure Flambda backend
       working-directory: flambda_backend
@@ -144,7 +144,7 @@ jobs:
       run: |
         if [ $run_testsuite = true ]; then target=ci; else target=compiler; fi
         export PATH=$GITHUB_WORKSPACE/ocaml-412/_install/bin:$PATH
-        if [ $build_upstream = true ]; then make -j$J build_upstream; else make $target; fi
+        if [ $build_upstream = true ]; then make -j$J build_and_test_upstream; else make $target; fi
       env:
         BUILD_OCAMLPARAM: ${{ matrix.ocamlparam }}
 

Makefile

@@ -437,6 +437,21 @@ install_upstream: build_upstream
 	(cd _build_upstream && $(MAKE) install)
 	cp ocaml/VERSION $(prefix)/lib/ocaml/
 
+.PHONY: build_and_test_upstream
+build_and_test_upstream: build_upstream
+	if $$(which gfortran > /dev/null 2>&1); then \
+	  export LIBRARY_PATH=$$(dirname $$(gfortran -print-file-name=libgfortran.a)); \
+	fi; \
+	cd _build_upstream/testsuite \
+	 && if $$(which parallel > /dev/null 2>&1); \
+            then \
+	      echo "Running testsuite in parallel (nproc=$$(nproc))"; \
+	      make --no-print-directory parallel; \
+            else \
+	      echo "Running testsuite sequentially"; \
+              make --no-print-directory all; \
+            fi
+
 .PHONY: coverage
 coverage: boot-runtest
 	rm -rf _coverage

configure.ac

@@ -54,7 +54,7 @@ AC_SUBST([coverage])
 AC_DISABLE_OPTION_CHECKING
 
 AX_SUBDIRS_CONFIGURE([ocaml],
-  [$middle_end_arg,-C,--disable-ocamldoc,--disable-stdlib-manpages],
+  [$middle_end_arg,-C,--disable-ocamldoc,--disable-stdlib-manpages,--enable-ocamltest],
   [],
   [],
   [])