From c7aa04c8ee8aa0ca4afb73cc404309035fcecb18 Mon Sep 17 00:00:00 2001
From: Sebastian Ohlmann <sebastian.ohlmann@mpcdf.mpg.de>
Date: Thu, 8 Nov 2018 12:10:13 +0100
Subject: [PATCH] Add CI test: distcheck with MPI

Some header files are only included when MPI is active (e.g. in the
generalized solver), thus the normal distcheck does not fail if they
are missing in the corresponding automake variables and are not
distributed.
---
 .gitlab-ci.yml                              | 10 ++++++++++
 ci_test_scripts/generate_gitlab_ci_tests.py |  9 +++++++++
 2 files changed, 19 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7eeb2574..1a21d224 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -115,6 +115,16 @@ distcheck:
 
 
 
+distcheck-mpi:
+  tags:
+    - buildtest
+  script:
+    - ./configure FC=mpiifort FCFLAGS="-xHost" CFLAGS="-march=native" SCALAPACK_LDFLAGS="$MKL_INTEL_SCALAPACK_LDFLAGS_MPI_NO_OMP" SCALAPACK_FCFLAGS="$MKL_INTEL_SCALAPACK_FCFLAGS_MPI_NO_OMP" --enable-option-checking=fatal --with-mpi=yes --disable-sse-assembly --disable-sse --disable-avx --disable-avx2 || { cat config.log; exit 1; }
+    # stupid 'make distcheck' leaves behind write-protected files that the stupid gitlab runner cannot remove
+    - make distcheck DISTCHECK_CONFIGURE_FLAGS="FC=mpiifort FCFLAGS=\"-xHost\" CFLAGS=\"-march=native\" SCALAPACK_LDFLAGS=\"$MKL_INTEL_SCALAPACK_LDFLAGS_MPI_NO_OMP\" SCALAPACK_FCFLAGS=\"$MKL_INTEL_SCALAPACK_FCFLAGS_MPI_NO_OMP\" --with-mpi=yes --disable-sse-assembly --disable-sse --disable-avx --disable-avx2" TASKS=2 TEST_FLAGS="150 50 16" || { chmod u+rwX -R . ; exit 1 ; }
+
+
+
 # test_project_1stage_legacy_api_gnu
 test_project_1stage_legacy_api_gnu:
   tags:
diff --git a/ci_test_scripts/generate_gitlab_ci_tests.py b/ci_test_scripts/generate_gitlab_ci_tests.py
index da966eec..30e09be6 100755
--- a/ci_test_scripts/generate_gitlab_ci_tests.py
+++ b/ci_test_scripts/generate_gitlab_ci_tests.py
@@ -327,6 +327,15 @@ print("    # stupid 'make distcheck' leaves behind write-protected files that th
 print("    - make distcheck DISTCHECK_CONFIGURE_FLAGS=\"--with-mpi=no --disable-sse-assembly --disable-sse --disable-avx --disable-avx2\" TASKS=2 TEST_FLAGS=\"150 50 16\" || { chmod u+rwX -R . ; exit 1 ; }")
 print("\n\n")
 
+print("distcheck-mpi:")
+print("  tags:")
+print("    - buildtest")
+print("  script:")
+print("    - ./configure FC=mpiifort FCFLAGS=\"-xHost\" CFLAGS=\"-march=native\" SCALAPACK_LDFLAGS=\"$MKL_INTEL_SCALAPACK_LDFLAGS_MPI_NO_OMP\" SCALAPACK_FCFLAGS=\"$MKL_INTEL_SCALAPACK_FCFLAGS_MPI_NO_OMP\" --enable-option-checking=fatal --with-mpi=yes --disable-sse-assembly --disable-sse --disable-avx --disable-avx2 || { cat config.log; exit 1; }")
+print("    # stupid 'make distcheck' leaves behind write-protected files that the stupid gitlab runner cannot remove")
+print('    - make distcheck DISTCHECK_CONFIGURE_FLAGS="FC=mpiifort FCFLAGS=\\"-xHost\\" CFLAGS=\\"-march=native\\" SCALAPACK_LDFLAGS=\\"$MKL_INTEL_SCALAPACK_LDFLAGS_MPI_NO_OMP\\" SCALAPACK_FCFLAGS=\\"$MKL_INTEL_SCALAPACK_FCFLAGS_MPI_NO_OMP\\" --with-mpi=yes --disable-sse-assembly --disable-sse --disable-avx --disable-avx2" TASKS=2 TEST_FLAGS="150 50 16" || { chmod u+rwX -R . ; exit 1 ; }')
+print("\n\n")
+
 
 # construct the builds of the "test_projects"
 
-- 
GitLab