cmake/meson: skip tests when used as external/subproject

Author: scivision

CMakeLists.txt

@@ -4,7 +4,7 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 project(hdf5iface
   LANGUAGES Fortran
-  VERSION 2.1.0
+  VERSION 2.2.0
   HOMEPAGE_URL https://github.com/scivision/h5fortran)
 enable_testing()
 
@@ -14,4 +14,9 @@ include(cmake/hdf5.cmake)
 
 add_subdirectory(src)
 
+# skip tests if used as ExternalProject
+if(NOT CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+  return()
+endif()
+
 add_subdirectory(tests)

meson.build

@@ -1,6 +1,6 @@
 project('h5fortran', 'fortran',
   meson_version : '>=0.52.0',
-  version : '2.1.0',
+  version : '2.2.0',
   default_options : ['default_library=static', 'buildtype=release', 'warning_level=3'])
 
 subdir('meson')
@@ -15,24 +15,6 @@ ooh5 = library('h5fortran',
 hdf5_interface = declare_dependency(link_with: ooh5, dependencies: hdf5)
 
 # --- testing
-subdir('tests')
-
-shapes = executable('shapes_hdf5', 'tests/GetShape.f90',
-  dependencies: hdf5_interface,
-  fortran_args: quiet)
-
-test('Shapes', shapes,
-  args: [meson.build_root()/'p5.h5','/group69/flux_node'],
-  is_parallel: false,
-  suite: 'h5fortran',
-  priority: -100,
-  timeout: 15)
-
-python = find_program('python')
-
-test('CheckShapes', python,
-  args: [files('tests/GetShapes.py'), meson.build_root()/'p5.h5', '/group69/flux_node'],
-  is_parallel: false,
-  suite: 'h5fortran',
-  priority: -100,
-  timeout: 30)
+if not meson.is_subproject()
+  subdir('tests')
+endif

tests/meson.build

@@ -1,8 +1,37 @@
+test_error = executable('test_error', 'test_error.f90',
+  dependencies: hdf5_interface)
+test('errors', test_error,
+  args: meson.current_build_dir(),
+  suite: 'h5basic',
+  timeout: 10)
+
+
 testh5 = executable('test_hdf5', 'test_hdf5_ifc.f90',
   dependencies: hdf5_interface,
   fortran_args: quiet)
 test('h5interface', testh5,
   is_parallel: false,
-  suite: 'h5fortran',
-  priority: 100,
+  suite: 'h5basic',
   timeout: 15)
+
+shapes = executable('shapes_hdf5', 'GetShape.f90',
+  dependencies: hdf5_interface,
+  fortran_args: quiet)
+
+testfn = meson.build_root()/'p5.h5'
+
+test('Shapes', shapes,
+  args: [testfn,'/group69/flux_node'],
+  is_parallel: false,
+  suite: 'h5shaky',
+  priority: -100,
+  timeout: 15)
+
+python = find_program('python')
+
+test('CheckShapes', python,
+  args: [files('GetShapes.py'), testfn, '/group69/flux_node'],
+  is_parallel: false,
+  suite: 'h5shaky',
+  priority: -100,
+  timeout: 30)