Accepting request 535993 from GNOME:Next

Fix testsuite with 0.43 - MPI just needs to beconfigured; and boost-static skipped, since we do not package static boost libs

OBS-URL: https://build.opensuse.org/request/show/535993
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=66

meson-no-static-boost.patch

@@ -0,0 +1,22 @@
+Index: meson-0.43.0/test\ cases/frameworks/1\ boost/meson.build
+===================================================================
+--- meson-0.43.0.orig/"test cases"/frameworks/"1 boost"/meson.build
++++ meson-0.43.0/"test cases"/frameworks/"1 boost"/meson.build
+@@ -10,7 +10,7 @@ add_project_arguments(['-DBOOST_LOG_DYN_
+ # Use one without a library dependency and one with it.
+ 
+ linkdep = dependency('boost', modules : ['thread', 'system'])
+-staticdep = dependency('boost', modules : ['thread', 'system'], static : true)
++# staticdep = dependency('boost', modules : ['thread', 'system'], static : true)
+ testdep = dependency('boost', modules : ['unit_test_framework'])
+ nomoddep = dependency('boost')
+ extralibdep = dependency('boost', modules : ['thread', 'system', 'log_setup', 'log'])
+@@ -22,7 +22,7 @@ nomodexe = executable('nomod', 'nomod.cp
+ extralibexe = executable('extralibexe', 'extralib.cpp', dependencies : extralibdep)
+ 
+ test('Boost linktest', linkexe)
+-test('Boost statictest', staticexe)
++# test('Boost statictest', staticexe)
+ test('Boost UTF test', unitexe)
+ test('Boost nomod', nomodexe)
+ test('Boost extralib test', extralibexe)

meson-testsuite.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 23 12:30:03 UTC 2017 - dimstar@opensuse.org
+
+- Setup MPI runtime environment before running the test suite.
+- Remove tests for static boost libraries from
+  test\ cases/frameworks/1\ boost/meson.build.
+
 -------------------------------------------------------------------
 Thu Oct 19 15:00:49 UTC 2017 - badshah400@gmail.com
 

meson-testsuite.spec

@@ -121,6 +121,8 @@ This package provides support for meson.build files in Vim.
 %patch0 -p1
 %patch1 -p1
 %patch100 -p1
+# Remove static boost tests from test cases/frameworks/1 boost (can't use patch due to spaces in dirname)
+sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build
 
 # We do not have gmock available at this moment - can't run the test suite for it
 rm -rf "test cases/frameworks/3 gmock" \
@@ -160,6 +162,7 @@ install -Dpm 0644 syntax-highlighting/vim/syntax/meson.vim \
 export LANG=C.UTF-8
 export MESON_PRINT_TEST_OUTPUT=1
 export SUSE_ASNEEDED=0
+source %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh
 python3 run_tests.py
 %endif
 

meson.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 23 12:30:03 UTC 2017 - dimstar@opensuse.org
+
+- Setup MPI runtime environment before running the test suite.
+- Remove tests for static boost libraries from
+  test\ cases/frameworks/1\ boost/meson.build.
+
 -------------------------------------------------------------------
 Thu Oct 19 15:00:49 UTC 2017 - badshah400@gmail.com
 

meson.spec

@@ -121,6 +121,8 @@ This package provides support for meson.build files in Vim.
 %patch0 -p1
 %patch1 -p1
 %patch100 -p1
+# Remove static boost tests from test cases/frameworks/1 boost (can't use patch due to spaces in dirname)
+sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build
 
 # We do not have gmock available at this moment - can't run the test suite for it
 rm -rf "test cases/frameworks/3 gmock" \
@@ -160,6 +162,7 @@ install -Dpm 0644 syntax-highlighting/vim/syntax/meson.vim \
 export LANG=C.UTF-8
 export MESON_PRINT_TEST_OUTPUT=1
 export SUSE_ASNEEDED=0
+source %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh
 python3 run_tests.py
 %endif