aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rwxr-xr-xtests/functional/lang.sh2
-rw-r--r--tests/unit/meson.build6
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/functional/lang.sh b/tests/functional/lang.sh
index 59db10340..ca54fb88d 100755
--- a/tests/functional/lang.sh
+++ b/tests/functional/lang.sh
@@ -155,7 +155,7 @@ else
echo ''
echo 'You can rerun this test with:'
echo ''
- echo ' _NIX_TEST_ACCEPT=1 make tests/functional/lang.sh.test'
+ echo ' _NIX_TEST_ACCEPT=1 just test --suite installcheck -v functional-lang'
echo ''
echo 'to regenerate the files containing the expected output,'
echo 'and then view the git diff to decide whether a change is'
diff --git a/tests/unit/meson.build b/tests/unit/meson.build
index 8b0c66dd8..04fdf62a7 100644
--- a/tests/unit/meson.build
+++ b/tests/unit/meson.build
@@ -12,7 +12,11 @@
# It's only ~200 lines; better to just refactor the tests themselves which we'll want to do anyway.
default_test_env = {
- 'ASAN_OPTIONS': 'detect_leaks=0:halt_on_error=1:abort_on_error=1:print_summary=1:dump_instruction_bytes=1'
+ 'ASAN_OPTIONS': 'detect_leaks=0:halt_on_error=1:abort_on_error=1:print_summary=1:dump_instruction_bytes=1',
+ # Prevents loading global configuration file in /etc/nix/nix.conf in tests 😱
+ 'NIX_CONF_DIR': '/var/empty',
+ # Prevent loading user configuration files in tests
+ 'NIX_USER_CONF_FILES': '',
}
libutil_test_support_sources = files(