From a3ada098282630e3fe3645d0336953914a68730e Mon Sep 17 00:00:00 2001
From: Daniel Arndt <arndtd@ornl.gov>
Date: Sat, 4 Jan 2020 18:32:39 +0100
Subject: [PATCH] Run python-bindings tests

---
 CMakeLists.txt                               |  3 +-
 contrib/python-bindings/CMakeLists.txt       |  2 ++
 contrib/python-bindings/tests/CMakeLists.txt | 30 ++++++++++++++++++++
 tests/CMakeLists.txt                         |  2 +-
 4 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 contrib/python-bindings/tests/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f14854ff3b..6098719428 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -156,13 +156,14 @@ ADD_SUBDIRECTORY(source) # has to be included after bundled
 ADD_SUBDIRECTORY(cmake/config) # has to be included after source
 ADD_SUBDIRECTORY(examples)
 
-ADD_SUBDIRECTORY(contrib/python-bindings)
 ADD_SUBDIRECTORY(contrib/utilities)
 
 IF(DEAL_II_HAVE_TESTS_DIRECTORY)
   ADD_SUBDIRECTORY(tests)
 ENDIF()
 
+ADD_SUBDIRECTORY(contrib/python-bindings) # has to be included after tests
+
 #
 # And finally, print the configuration:
 #
diff --git a/contrib/python-bindings/CMakeLists.txt b/contrib/python-bindings/CMakeLists.txt
index 884b8322c3..e29c34c99f 100644
--- a/contrib/python-bindings/CMakeLists.txt
+++ b/contrib/python-bindings/CMakeLists.txt
@@ -78,6 +78,8 @@ IF(DEAL_II_COMPONENT_PYTHON_BINDINGS)
 
   ADD_SUBDIRECTORY(source)
 
+  ADD_SUBDIRECTORY(tests)
+
   MESSAGE(STATUS "Setting up python bindings - Done")
   MESSAGE(STATUS "")
 
diff --git a/contrib/python-bindings/tests/CMakeLists.txt b/contrib/python-bindings/tests/CMakeLists.txt
new file mode 100644
index 0000000000..f010303ca7
--- /dev/null
+++ b/contrib/python-bindings/tests/CMakeLists.txt
@@ -0,0 +1,30 @@
+## ---------------------------------------------------------------------
+##
+## Copyright (C) 2020 by the deal.II authors
+##
+## This file is part of the deal.II library.
+##
+## The deal.II library is free software; you can use it, redistribute
+## it, and/or modify it under the terms of the GNU Lesser General
+## Public License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+## The full text of the license can be found in the file LICENSE.md at
+## the top level directory of deal.II.
+##
+## ---------------------------------------------------------------------
+
+#
+# Make sure that the tests are picked up by a global CTest call
+#
+FILE(APPEND ${CMAKE_BINARY_DIR}/CTestTestfile.cmake "SUBDIRS(contrib/python-bindings/tests)\n")
+ENABLE_TESTING()
+
+FILE(GLOB _tests "${CMAKE_CURRENT_SOURCE_DIR}/*.py")
+FOREACH(_test_path ${_tests})
+ GET_FILENAME_COMPONENT(_test ${_test_path} NAME_WE)
+ ADD_TEST(NAME python-bindings/${_test} COMMAND ${PYTHON_EXECUTABLE} ${_test_path})
+ SET_TESTS_PROPERTIES(python-bindings/${_test} PROPERTIES ENVIRONMENT
+   PYTHONPATH=${CMAKE_BINARY_DIR}/${DEAL_II_PYTHON_RELDIR}/../:$ENV{PYTHONPATH}
+   )
+ENDFOREACH()
+
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b2b80498fc..45772a695e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -75,7 +75,7 @@ IF(DEFINED DEAL_II_HAVE_TESTS_DIRECTORY)
   # Write minimalistic CTestTestfile.cmake files to CMAKE_BINARY_DIR and
   # CMAKE_BINARY_DIR/tests:
   #
-  FILE(WRITE ${CMAKE_BINARY_DIR}/CTestTestfile.cmake "SUBDIRS(tests)")
+  FILE(WRITE ${CMAKE_BINARY_DIR}/CTestTestfile.cmake "SUBDIRS(tests)\n")
 
   SET(_options "-DDEAL_II_DIR=${CMAKE_BINARY_DIR}")
 
-- 
2.39.5