diff options
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | meson_options.txt | 6 | ||||
| -rw-r--r-- | tests/meson.build | 2 | ||||
| -rw-r--r-- | tools/meson.build | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f3abdc..d01fc57 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -323,7 +323,7 @@ test-debian-asan: - test -d cache/dav1d-test-data.git && GIT_DIR=cache/dav1d-test-data.git git fetch --refmap=refs/heads/master:refs/heads/master origin master - test -d cache/dav1d-test-data.git || git clone --bare https://code.videolan.org/videolan/dav1d-test-data.git cache/dav1d-test-data.git - git clone cache/dav1d-test-data.git tests/dav1d-test-data - - meson build --buildtype debugoptimized -Dtestdata_tests=true -Dlogging=false -Db_sanitize=address -Dbuild_asm=false + - meson build --buildtype debugoptimized -Dtestdata_tests=true -Dlogging=false -Db_sanitize=address -Denable_asm=false - ninja -C build - cd build && time meson test -v --setup=sanitizer dependencies: [] @@ -345,7 +345,7 @@ test-debian-msan: - test -d cache/dav1d-test-data.git && GIT_DIR=cache/dav1d-test-data.git git fetch --refmap=refs/heads/master:refs/heads/master origin master - test -d cache/dav1d-test-data.git || git clone --bare https://code.videolan.org/videolan/dav1d-test-data.git cache/dav1d-test-data.git - git clone cache/dav1d-test-data.git tests/dav1d-test-data - - env CC=clang meson build --buildtype debugoptimized -Dtestdata_tests=true -Dlogging=false -Db_sanitize=memory -Db_lundef=false -Dbuild_asm=false + - env CC=clang meson build --buildtype debugoptimized -Dtestdata_tests=true -Dlogging=false -Db_sanitize=memory -Db_lundef=false -Denable_asm=false - ninja -C build - cd build && time meson test -v --setup=sanitizer dependencies: [] @@ -367,7 +367,7 @@ test-debian-ubsan: - test -d cache/dav1d-test-data.git && GIT_DIR=cache/dav1d-test-data.git git fetch --refmap=refs/heads/master:refs/heads/master origin master - test -d cache/dav1d-test-data.git || git clone --bare https://code.videolan.org/videolan/dav1d-test-data.git cache/dav1d-test-data.git - git clone cache/dav1d-test-data.git tests/dav1d-test-data - - env CC=clang meson build --buildtype debugoptimized -Dtestdata_tests=true -Dlogging=false -Db_sanitize=undefined -Db_lundef=false -Dbuild_asm=false + - env CC=clang meson build --buildtype debugoptimized -Dtestdata_tests=true -Dlogging=false -Db_sanitize=undefined -Db_lundef=false -Denable_asm=false - ninja -C build - cd build && time meson test -v --setup=sanitizer dependencies: [] @@ -78,7 +78,7 @@ The [VideoLAN Code of Conduct](https://wiki.videolan.org/CoC) applies to this pr # Run tests -1. During initial build dir setup or `meson configure` specify `-Dbuild_tests=true` +1. During initial build dir setup or `meson configure` specify `-Denable_tests=true` 2. In the build directory run `meson test` optionally with `-v` for more verbose output, especially useful for checkasm @@ -89,10 +89,10 @@ The [VideoLAN Code of Conduct](https://wiki.videolan.org/CoC) applies to this pr ``` git clone https://code.videolan.org/videolan/dav1d-test-data.git tests/dav1d-test-data ``` -2. During initial build dir setup or `meson configure` specify `-Dbuild_tests=true` and `-Dtestdata_tests=true` +2. During initial build dir setup or `meson configure` specify `-Denable_tests=true` and `-Dtestdata_tests=true` ``` - meson .test -Dbuild_tests=true -Dtestdata_tests=true + meson .test -Denable_tests=true -Dtestdata_tests=true ``` 3. In the build directory run `meson test` optionally with `-v` for more verbose output diff --git a/meson.build b/meson.build index c58e602..2ac98d6 100644 --- a/meson.build +++ b/meson.build @@ -61,7 +61,7 @@ foreach bitdepth : ['8', '16'] endforeach # ASM option -is_asm_enabled = (get_option('build_asm') == true and +is_asm_enabled = (get_option('enable_asm') == true and (host_machine.cpu_family().startswith('x86') or host_machine.cpu_family() == 'aarch64' or host_machine.cpu_family().startswith('arm') or @@ -69,7 +69,7 @@ is_asm_enabled = (get_option('build_asm') == true and cdata.set10('HAVE_ASM', is_asm_enabled) if is_asm_enabled and get_option('b_sanitize') == 'memory' - error('asm causes false positive with memory sanitizer. Use \'-Dbuild_asm=false\'.') + error('asm causes false positive with memory sanitizer. Use \'-Denable_asm=false\'.') endif # Logging option diff --git a/meson_options.txt b/meson_options.txt index 55a328b..0a7beb5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -5,17 +5,17 @@ option('bitdepths', choices: ['8', '16'], description: 'Enable only specified bitdepths') -option('build_asm', +option('enable_asm', type: 'boolean', value: true, description: 'Build asm files, if available') -option('build_tools', +option('enable_tools', type: 'boolean', value: true, description: 'Build dav1d cli tools') -option('build_tests', +option('enable_tests', type: 'boolean', value: true, description: 'Build dav1d tests') diff --git a/tests/meson.build b/tests/meson.build index 3fe7574..dd2b142 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -27,7 +27,7 @@ # # Leave subdir if tests are disabled -if not get_option('build_tests') +if not get_option('enable_tests') subdir_done() endif diff --git a/tools/meson.build b/tools/meson.build index 5b942b3..0bb1884 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -27,7 +27,7 @@ # # Leave subdir if tools are disabled -if not get_option('build_tools') +if not get_option('enable_tools') subdir_done() endif |