tests: Don't advertise VIR_TEST_EXPENSIVE to users

Right now, the logic that takes care of deciding whether expensive
tests should be run or not is not working correctly: more
specifically, it's not possible to use something like

  $ VIR_TEST_EXPENSIVE=1 ninja test

to override the default choice, because in meson.build we always
pass an explicit value that overrides whatever is present in the
environment.

We could implement logic to make this work properly, but that
would require some refactoring of our test infrastructure and is
arguably of little value given that running

  $ meson build -Dexpensive_tests=enabled

is very fast, so let's just stop telling users about the variable
instead and call it a day.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/docs/advanced-tests.rst b/docs/advanced-tests.rst
index 772fe1dd16a2a5092611e272a2d5f69d92c610ee..f17d8b003161a8df51fe9d06d145f10e1b233b96 100644 (file)
--- a/docs/advanced-tests.rst
+++ b/docs/advanced-tests.rst
@@ -26,13 +26,7 @@ Some tests are skipped by default in a development environment,
 based on the time they take in comparison to the likelihood
 that those tests will turn up problems during incremental
 builds. These tests default to being run when building from a
-tarball or with the configure option -Dexpensive_tests=enabled;
-you can also force a one-time toggle of these tests by setting
-VIR_TEST_EXPENSIVE to 0 or 1 at make time, as in:
-
-::
-
-  $ VIR_TEST_EXPENSIVE=1 ninja test
+tarball or with the configure option -Dexpensive_tests=enabled.
 
 If you encounter any failing tests, the VIR_TEST_DEBUG
 environment variable may provide extra information to debug the

diff --git a/meson_options.txt b/meson_options.txt
index f92c80553cf8e903c028669b28186d45c46449b5..74de06438419f64e8a636d8ea092fe19a79b6364 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,7 +3,7 @@ option('packager', type: 'string', value: '', description: 'Extra packager name'
 option('packager_version', type: 'string', value: '', description: 'Extra packager version')
 option('system', type: 'boolean', value: false, description: 'Set install paths to system ones')
 option('runstatedir', type: 'string', value: '', description: 'State directory for temporary sockets, pid files, etc')
-option('expensive_tests', type: 'feature', value: 'auto', description: 'set the default for enabling expensive tests (long timeouts), use VIR_TEST_EXPENSIVE to override')
+option('expensive_tests', type: 'feature', value: 'auto', description: 'set the default for enabling expensive tests (long timeouts)')
 option('test_coverage', type: 'boolean', value: false, description: 'turn on code coverage instrumentation')
 option('git_werror', type: 'feature', value: 'auto', description: 'use -Werror if building from GIT')
 option('rpath', type: 'feature', value: 'auto', description: 'whether to include rpath information in installed binaries and libraries')

diff --git a/tests/test-lib.sh b/tests/test-lib.sh
index cc3924c07a8e2f7e7fb5b38ec9a693fdb20a2e57..67065a9362bdccfeda1aeda8d7584ef311d8e4a8 100644 (file)
--- a/tests/test-lib.sh
+++ b/tests/test-lib.sh
@@ -200,7 +200,7 @@ test_expensive()
   if test "$VIR_TEST_EXPENSIVE" != 1; then
     skip_test_ '
 This test is very expensive, so it is disabled by default.
-To run it anyway, rerun: VIR_TEST_EXPENSIVE=1 ninja test
+To change the default, configure with: meson -Dexpensive_tests=enabled
 '
   fi
 }