From 3e1436683402ca285522e05423ea0705707d987d Mon Sep 17 00:00:00 2001 From: Nikolaus Rath Date: Mon, 10 Apr 2017 16:46:35 -0700 Subject: Build tests by default. --- README.md | 2 +- meson.build | 2 +- test/meson.build | 13 ++++++------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 00b423e..c1f0509 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Installation You can download libfuse from https://github.com/libfuse/libfuse/releases. To build and install, we -recommend to use [Meson](http://mesonbuild.com/) (version 0.37 or +recommend to use [Meson](http://mesonbuild.com/) (version 0.38 or newer) and [Ninja](https://ninja-build.org). After extracting the libfuse tarball, create a (temporary) build directory and run Meson: diff --git a/meson.build b/meson.build index 71c8ae2..b13ed06 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ # (even though this isn't actually Python code) project('libfuse3', 'c', version: '3.1.0', - meson_version: '>= 0.37', + meson_version: '>= 0.38', default_options: [ 'buildtype=plain' ]) # diff --git a/test/meson.build b/test/meson.build index 7f07e65..44c0eb4 100644 --- a/test/meson.build +++ b/test/meson.build @@ -14,13 +14,12 @@ td += executable('test_syscalls', 'test_syscalls.c', include_directories: include_dirs, install: false) -# Actual tests are written in Python and can simply be copied. -foreach fname : [ 'conftest.py', 'pytest.ini', 'test_examples.py', - 'util.py' ] - td += custom_target(fname, input: fname, output: fname, - command: ['cp', '-fPu', '--preserve=mode', - '@INPUT@', '@OUTPUT@']) -endforeach +test_scripts = [ 'conftest.py', 'pytest.ini', 'test_examples.py', + 'util.py' ] +td += custom_target('test_scripts', input: test_scripts, + output: test_scripts, build_by_default: true, + command: ['cp', '-fPu', '--preserve=mode', + '@INPUT@', meson.current_build_dir() ]) # Create a new 'tests' target that we can run with Ninja run_target('tests', depends: td, -- cgit v1.2.3