Filter out (mosts test) when !doCheck
This commit is contained in:
parent
4bbc7b8f75
commit
73b6c1fb11
|
@ -1,4 +1,8 @@
|
||||||
SUBDIRS = src t doc
|
SUBDIRS = src doc
|
||||||
|
if CAN_DO_CHECK
|
||||||
|
SUBDIRS += t
|
||||||
|
endif
|
||||||
|
|
||||||
BOOTCLEAN_SUBDIRS = $(SUBDIRS)
|
BOOTCLEAN_SUBDIRS = $(SUBDIRS)
|
||||||
DIST_SUBDIRS = $(SUBDIRS)
|
DIST_SUBDIRS = $(SUBDIRS)
|
||||||
EXTRA_DIST = hydra-module.nix
|
EXTRA_DIST = hydra-module.nix
|
||||||
|
|
16
configure.ac
16
configure.ac
|
@ -53,9 +53,6 @@ PKG_CHECK_MODULES([NIX], [nix-main nix-expr nix-store])
|
||||||
testPath="$(dirname $(type -p expr))"
|
testPath="$(dirname $(type -p expr))"
|
||||||
AC_SUBST(testPath)
|
AC_SUBST(testPath)
|
||||||
|
|
||||||
jobsPath="$(realpath ./t/jobs)"
|
|
||||||
AC_SUBST(jobsPath)
|
|
||||||
|
|
||||||
CXXFLAGS+=" -include nix/config.h"
|
CXXFLAGS+=" -include nix/config.h"
|
||||||
|
|
||||||
AC_CONFIG_FILES([
|
AC_CONFIG_FILES([
|
||||||
|
@ -71,10 +68,21 @@ AC_CONFIG_FILES([
|
||||||
src/lib/Makefile
|
src/lib/Makefile
|
||||||
src/root/Makefile
|
src/root/Makefile
|
||||||
src/script/Makefile
|
src/script/Makefile
|
||||||
|
])
|
||||||
|
|
||||||
|
# Tests might be filtered out
|
||||||
|
AM_CONDITIONAL([CAN_DO_CHECK], [test -f "$srcdir/t/api-test.t"])
|
||||||
|
AM_COND_IF(
|
||||||
|
[CAN_DO_CHECK],
|
||||||
|
[
|
||||||
|
jobsPath="$(realpath ./t/jobs)"
|
||||||
|
AC_SUBST(jobsPath)
|
||||||
|
AC_CONFIG_FILES([
|
||||||
t/Makefile
|
t/Makefile
|
||||||
t/jobs/config.nix
|
t/jobs/config.nix
|
||||||
t/jobs/declarative/project.json
|
t/jobs/declarative/project.json
|
||||||
])
|
])
|
||||||
|
])
|
||||||
|
|
||||||
AC_CONFIG_COMMANDS([executable-scripts], [])
|
AC_CONFIG_COMMANDS([executable-scripts], [])
|
||||||
|
|
||||||
|
|
|
@ -144,9 +144,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
./src
|
./src
|
||||||
./doc
|
./doc
|
||||||
./hydra-module.nix
|
./hydra-module.nix
|
||||||
# TODO only when `doCheck`
|
# These are always needed to appease Automake
|
||||||
./t
|
./t/Makefile.am
|
||||||
|
./t/jobs/config.nix.in
|
||||||
|
./t/jobs/declarative/project.json.in
|
||||||
] ++ lib.optionals finalAttrs.doCheck [
|
] ++ lib.optionals finalAttrs.doCheck [
|
||||||
|
./t
|
||||||
./.perlcriticrc
|
./.perlcriticrc
|
||||||
./.yath.rc
|
./.yath.rc
|
||||||
]);
|
]);
|
||||||
|
|
Loading…
Reference in a new issue