diff options
| author | jade <lix@jade.fyi> | 2024-10-09 20:37:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@localhost> | 2024-10-09 20:37:16 +0000 |
| commit | 7f7a38f2788ba7fa46cf38127f525700cf63e153 (patch) | |
| tree | 70981196e35b96114d2d92129b62dba7d586e3be /tests | |
| parent | 0012887310f24283e8a9ca08e0c2a49219ea4ff5 (diff) | |
| parent | 345e3d068a7f3eb37bb795a38572ae06213a8341 (diff) | |
Merge changes Ib27cb43d,I03687b8b into main
* changes:
testsuite: override NIX_CONF_DIR and NIX_USER_CONF_FILES
Remove some outdated `make test` invocation suggestions
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/functional/lang.sh | 2 | ||||
| -rw-r--r-- | tests/unit/meson.build | 6 |
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( |