From edb260b4f4e79433f38bdda11bc84fa5ee56b080 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Mon, 31 Jul 2017 15:38:26 -0400
Subject: Move MPI tests into frameworks.

This prevents them being cross-compiled (which wouldn't work without MPI
cross-compilers) and disables Windows builds (will need to be fixed
later.)
---
 test cases/common/157 mpi/main.c         | 27 --------------------------
 test cases/common/157 mpi/main.cpp       | 11 -----------
 test cases/common/157 mpi/main.f90       | 21 --------------------
 test cases/common/157 mpi/meson.build    | 33 --------------------------------
 test cases/frameworks/17 mpi/main.c      | 27 ++++++++++++++++++++++++++
 test cases/frameworks/17 mpi/main.cpp    | 11 +++++++++++
 test cases/frameworks/17 mpi/main.f90    | 21 ++++++++++++++++++++
 test cases/frameworks/17 mpi/meson.build | 33 ++++++++++++++++++++++++++++++++
 8 files changed, 92 insertions(+), 92 deletions(-)
 delete mode 100644 test cases/common/157 mpi/main.c
 delete mode 100644 test cases/common/157 mpi/main.cpp
 delete mode 100644 test cases/common/157 mpi/main.f90
 delete mode 100644 test cases/common/157 mpi/meson.build
 create mode 100644 test cases/frameworks/17 mpi/main.c
 create mode 100644 test cases/frameworks/17 mpi/main.cpp
 create mode 100644 test cases/frameworks/17 mpi/main.f90
 create mode 100644 test cases/frameworks/17 mpi/meson.build

diff --git a/test cases/common/157 mpi/main.c b/test cases/common/157 mpi/main.c
deleted file mode 100644
index e44357a..0000000
--- a/test cases/common/157 mpi/main.c	
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <stdio.h>
-#include <mpi.h>
-
-int main(int argc, char **argv)
-{
-    int ier, flag;
-    ier = MPI_Init(&argc, &argv);
-    if (ier) {
-        printf("Unable to initialize MPI: %d\n", ier);
-        return 1;
-    }
-    ier = MPI_Initialized(&flag);
-    if (ier) {
-        printf("Unable to check MPI initialization state: %d\n", ier);
-        return 1;
-    }
-    if (!flag) {
-        printf("MPI did not initialize!\n");
-        return 1;
-    }
-    ier = MPI_Finalize();
-    if (ier) {
-        printf("Unable to finalize MPI: %d\n", ier);
-        return 1;
-    }
-    return 0;
-}
diff --git a/test cases/common/157 mpi/main.cpp b/test cases/common/157 mpi/main.cpp
deleted file mode 100644
index 0e0b621..0000000
--- a/test cases/common/157 mpi/main.cpp	
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <mpi.h>
-
-int main(int argc, char **argv)
-{
-    MPI::Init(argc, argv);
-    if (!MPI::Is_initialized()) {
-        printf("MPI did not initialize!\n");
-        return 1;
-    }
-    MPI::Finalize();
-}
diff --git a/test cases/common/157 mpi/main.f90 b/test cases/common/157 mpi/main.f90
deleted file mode 100644
index d379e96..0000000
--- a/test cases/common/157 mpi/main.f90	
+++ /dev/null
@@ -1,21 +0,0 @@
-program mpitest
-  implicit none
-  include 'mpif.h'
-  logical :: flag
-  integer :: ier
-  call MPI_Init(ier)
-  if (ier /= 0) then
-    print *, 'Unable to initialize MPI: ', ier
-    stop 1
-  endif
-  call MPI_Initialized(flag, ier)
-  if (ier /= 0) then
-    print *, 'Unable to check MPI initialization state: ', ier
-    stop 1
-  endif
-  call MPI_Finalize(ier)
-  if (ier /= 0) then
-    print *, 'Unable to finalize MPI: ', ier
-    stop 1
-  endif
-end program mpitest
diff --git a/test cases/common/157 mpi/meson.build b/test cases/common/157 mpi/meson.build
deleted file mode 100644
index 5e9bc56..0000000
--- a/test cases/common/157 mpi/meson.build	
+++ /dev/null
@@ -1,33 +0,0 @@
-project('mpi', 'c', 'cpp')
-
-cc = meson.get_compiler('c')
-
-if build_machine.system() == 'windows' and cc.get_id() != 'msvc'
-  error('MESON_SKIP_TEST: MPI not available on Windows without MSVC.')
-endif
-
-mpic = dependency('mpi', language : 'c')
-exec = executable('exec',
-  'main.c',
-  dependencies : [mpic])
-
-test('MPI C', exec)
-
-if build_machine.system() != 'windows'
-  # C++ MPI not supported by MS-MPI used on AppVeyor.
-  mpicpp = dependency('mpi', language : 'cpp')
-  execpp = executable('execpp',
-    'main.cpp',
-    dependencies : [mpicpp])
-
-  test('MPI C++', execpp)
-endif
-
-if add_languages('fortran', required : false)
-  mpifort = dependency('mpi', language : 'fortran')
-  exef = executable('exef',
-    'main.f90',
-    dependencies : [mpifort])
-
-  test('MPI Fortran', exef)
-endif
diff --git a/test cases/frameworks/17 mpi/main.c b/test cases/frameworks/17 mpi/main.c
new file mode 100644
index 0000000..e44357a
--- /dev/null
+++ b/test cases/frameworks/17 mpi/main.c	
@@ -0,0 +1,27 @@
+#include <stdio.h>
+#include <mpi.h>
+
+int main(int argc, char **argv)
+{
+    int ier, flag;
+    ier = MPI_Init(&argc, &argv);
+    if (ier) {
+        printf("Unable to initialize MPI: %d\n", ier);
+        return 1;
+    }
+    ier = MPI_Initialized(&flag);
+    if (ier) {
+        printf("Unable to check MPI initialization state: %d\n", ier);
+        return 1;
+    }
+    if (!flag) {
+        printf("MPI did not initialize!\n");
+        return 1;
+    }
+    ier = MPI_Finalize();
+    if (ier) {
+        printf("Unable to finalize MPI: %d\n", ier);
+        return 1;
+    }
+    return 0;
+}
diff --git a/test cases/frameworks/17 mpi/main.cpp b/test cases/frameworks/17 mpi/main.cpp
new file mode 100644
index 0000000..0e0b621
--- /dev/null
+++ b/test cases/frameworks/17 mpi/main.cpp	
@@ -0,0 +1,11 @@
+#include <mpi.h>
+
+int main(int argc, char **argv)
+{
+    MPI::Init(argc, argv);
+    if (!MPI::Is_initialized()) {
+        printf("MPI did not initialize!\n");
+        return 1;
+    }
+    MPI::Finalize();
+}
diff --git a/test cases/frameworks/17 mpi/main.f90 b/test cases/frameworks/17 mpi/main.f90
new file mode 100644
index 0000000..d379e96
--- /dev/null
+++ b/test cases/frameworks/17 mpi/main.f90	
@@ -0,0 +1,21 @@
+program mpitest
+  implicit none
+  include 'mpif.h'
+  logical :: flag
+  integer :: ier
+  call MPI_Init(ier)
+  if (ier /= 0) then
+    print *, 'Unable to initialize MPI: ', ier
+    stop 1
+  endif
+  call MPI_Initialized(flag, ier)
+  if (ier /= 0) then
+    print *, 'Unable to check MPI initialization state: ', ier
+    stop 1
+  endif
+  call MPI_Finalize(ier)
+  if (ier /= 0) then
+    print *, 'Unable to finalize MPI: ', ier
+    stop 1
+  endif
+end program mpitest
diff --git a/test cases/frameworks/17 mpi/meson.build b/test cases/frameworks/17 mpi/meson.build
new file mode 100644
index 0000000..5e9bc56
--- /dev/null
+++ b/test cases/frameworks/17 mpi/meson.build	
@@ -0,0 +1,33 @@
+project('mpi', 'c', 'cpp')
+
+cc = meson.get_compiler('c')
+
+if build_machine.system() == 'windows' and cc.get_id() != 'msvc'
+  error('MESON_SKIP_TEST: MPI not available on Windows without MSVC.')
+endif
+
+mpic = dependency('mpi', language : 'c')
+exec = executable('exec',
+  'main.c',
+  dependencies : [mpic])
+
+test('MPI C', exec)
+
+if build_machine.system() != 'windows'
+  # C++ MPI not supported by MS-MPI used on AppVeyor.
+  mpicpp = dependency('mpi', language : 'cpp')
+  execpp = executable('execpp',
+    'main.cpp',
+    dependencies : [mpicpp])
+
+  test('MPI C++', execpp)
+endif
+
+if add_languages('fortran', required : false)
+  mpifort = dependency('mpi', language : 'fortran')
+  exef = executable('exef',
+    'main.f90',
+    dependencies : [mpifort])
+
+  test('MPI Fortran', exef)
+endif
-- 
cgit v1.1