From 3b47d161e7ebd691ea6e6730f12548610f96477d Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sun, 18 Jul 2021 23:14:35 +0200 Subject: Cuda: Add test for -DNDEBUG --- test cases/cuda/8 release/main.cu | 4 ++++ test cases/cuda/8 release/meson.build | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'test cases') diff --git a/test cases/cuda/8 release/main.cu b/test cases/cuda/8 release/main.cu index bd1dbc4a0..2a9887491 100644 --- a/test cases/cuda/8 release/main.cu +++ b/test cases/cuda/8 release/main.cu @@ -1,6 +1,10 @@ #include #include +#ifndef NDEBUG +#error "NDEBUG not defined, this is a Meson bug" +#endif + int cuda_devices(void) { int result = 0; cudaGetDeviceCount(&result); diff --git a/test cases/cuda/8 release/meson.build b/test cases/cuda/8 release/meson.build index bdb311d96..e6207edd8 100644 --- a/test cases/cuda/8 release/meson.build +++ b/test cases/cuda/8 release/meson.build @@ -1,4 +1,4 @@ -project('release', 'cuda', version : '1.0.0', default_options : ['buildtype=release']) +project('release', 'cuda', version : '1.0.0', default_options : ['buildtype=release', 'b_ndebug=if-release']) exe = executable('prog', 'main.cu') test('cudatest', exe) -- cgit v1.2.3 From 47a8e7ece7fe4bb8ce9d838fb18d6c7f71c1cd5b Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sun, 18 Jul 2021 23:14:37 +0200 Subject: Cuda: Add test for -isystem/usr/include --- test cases/cuda/8 release/meson.build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'test cases') diff --git a/test cases/cuda/8 release/meson.build b/test cases/cuda/8 release/meson.build index e6207edd8..c5cad321f 100644 --- a/test cases/cuda/8 release/meson.build +++ b/test cases/cuda/8 release/meson.build @@ -1,4 +1,10 @@ -project('release', 'cuda', version : '1.0.0', default_options : ['buildtype=release', 'b_ndebug=if-release']) +project('release', 'cpp', 'cuda', version : '1.0.0', default_options : ['buildtype=release', 'b_ndebug=if-release']) -exe = executable('prog', 'main.cu') +# We don't actually need boost, but it serves as a common dependency +# that has the potential to add "-isystem/usr/include" to the compile +# line. By making it optional, we test that system search paths get +# removed without unnecessarily failing the test if boost is absent. +boost_dep = dependency('boost', include_type : 'system', required : false) + +exe = executable('prog', 'main.cu', dependencies : boost_dep) test('cudatest', exe) -- cgit v1.2.3 From 5c45a26c270cce4534ef651bfa0179f1472a00e0 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sun, 18 Jul 2021 23:14:40 +0200 Subject: Cuda: Add test for shared versioned internal libs --- test cases/cuda/4 shared/shared/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'test cases') diff --git a/test cases/cuda/4 shared/shared/meson.build b/test cases/cuda/4 shared/shared/meson.build index 59879166b..61cf1d382 100644 --- a/test cases/cuda/4 shared/shared/meson.build +++ b/test cases/cuda/4 shared/shared/meson.build @@ -1,5 +1,7 @@ libkernels = shared_library('kernels', 'kernels.cu', cuda_args: ['-DTAG_IS_SHARED=1', '-DTAG_IS_BUILDING=1'], - gnu_symbol_visibility: 'hidden') + gnu_symbol_visibility: 'hidden', + soversion : 1, + version : '1.2.3') libkernels = declare_dependency(compile_args: ['-DTAG_IS_SHARED=1'], link_with: libkernels) -- cgit v1.2.3