mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-25 23:36:16 +02:00
Merge remote-tracking branch 'upstream/master' into overlayfs-store
This commit is contained in:
commit
4107adcef8
3 changed files with 12 additions and 3 deletions
2
Makefile
2
Makefile
|
@ -27,9 +27,9 @@ makefiles += \
|
||||||
src/libstore/tests/local.mk \
|
src/libstore/tests/local.mk \
|
||||||
src/libexpr/tests/local.mk \
|
src/libexpr/tests/local.mk \
|
||||||
tests/local.mk \
|
tests/local.mk \
|
||||||
tests/overlay-local-store/local.mk \
|
|
||||||
tests/ca/local.mk \
|
tests/ca/local.mk \
|
||||||
tests/dyn-drv/local.mk \
|
tests/dyn-drv/local.mk \
|
||||||
|
tests/overlay-local-store/local.mk \
|
||||||
tests/test-libstoreconsumer/local.mk \
|
tests/test-libstoreconsumer/local.mk \
|
||||||
tests/plugins/local.mk
|
tests/plugins/local.mk
|
||||||
else
|
else
|
||||||
|
|
|
@ -28,7 +28,8 @@ ran test tests/bar.sh... [PASS]
|
||||||
### Grouping tests
|
### Grouping tests
|
||||||
|
|
||||||
Sometimes it is useful to group related tests so they can be easily run together without running the entire test suite.
|
Sometimes it is useful to group related tests so they can be easily run together without running the entire test suite.
|
||||||
For example, `tests/ca/local.mk` defines a "ca" test group for tests relating to content-addressed derivation outputs.
|
Each test group is in a subdirectory of `tests`.
|
||||||
|
For example, `tests/ca/local.mk` defines a `ca` test group for content-addressed derivation outputs.
|
||||||
|
|
||||||
That test group can be run like this:
|
That test group can be run like this:
|
||||||
|
|
||||||
|
|
|
@ -161,6 +161,14 @@ ifdef libs-list
|
||||||
@echo "The following libraries can be built:"
|
@echo "The following libraries can be built:"
|
||||||
@echo ""
|
@echo ""
|
||||||
@for i in $(libs-list); do echo " $$i"; done
|
@for i in $(libs-list); do echo " $$i"; done
|
||||||
|
endif
|
||||||
|
ifdef install-tests-groups
|
||||||
|
@echo ""
|
||||||
|
@echo "The following groups of functional tests can be run:"
|
||||||
|
@echo ""
|
||||||
|
@for i in $(install-tests-groups); do echo " $$i.test-group"; done
|
||||||
|
@echo ""
|
||||||
|
@echo "(installcheck includes tests in test groups too.)"
|
||||||
endif
|
endif
|
||||||
@echo ""
|
@echo ""
|
||||||
@echo "The following variables control the build:"
|
@echo "The following variables control the build:"
|
||||||
|
|
Loading…
Reference in a new issue