From 3429622d754a87ecca98b3fbde994f24e40d34b4 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Mon, 20 Apr 2020 20:10:25 +0300 Subject: Rewrite configuration tests in catch2 - Drop s_conf check in operator<< as s_conf cannot be nullptr there - Add arithmetic type cast to string values --- lib/configuration/meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/configuration/meson.build') diff --git a/lib/configuration/meson.build b/lib/configuration/meson.build index a0d915c..104f046 100644 --- a/lib/configuration/meson.build +++ b/lib/configuration/meson.build @@ -3,12 +3,12 @@ dep_configuration = declare_dependency( link_with: static_library('configuration', ['configuration.cpp', 'qt_specialization.cpp'], dependencies: dep_qt5) ) -test('configuration: parser', - executable('configuration-parser', - sources: [ 'test/parser.cpp' ], - dependencies: [ dep_qt5, dep_gtest, dep_configuration ] +test('configuration', executable('configuration-parser', + sources: [ 'test/main.cpp' ], + dependencies: [ dep_qt5, dep_catch, dep_configuration ] ), - env: environment({ 'CONFIGFILE' : meson.current_source_dir()/'test/defaultrc.ini' }), + env: 'CONFIGFILE='+meson.current_source_dir()/'test/defaultrc.ini', + args: [ '-platform', 'offscreen' ], workdir: meson.current_source_dir()/'test' ) -- cgit v1.2.1