enable check by default

aakropotkin · Jan 1, 2024 · a558814 · a558814
1 parent 5337456
commit a558814
Show file tree

Hide file tree

Showing 5 changed files with 229 additions and 37 deletions.
diff --git a/default.nix b/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, autoreconfHook, jq, bats }: let
+{ stdenv, lib, autoreconfHook, jq, bats, doCheck ? true }: let
   batsWith = bats.withLibraries (p: [
     p.bats-assert
     p.bats-file
@@ -10,5 +10,6 @@ in stdenv.mkDerivation {
   version = "0.1.0";
   nativeBuildInputs = [autoreconfHook batsWith];
   buildInputs = [jq];
+  inherit doCheck;
   meta.license = lib.licenses.gpl3;
 }
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -4,7 +4,7 @@
 #
 # ---------------------------------------------------------------------------- #
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I ../m4
 
 SUBDIRS = ccjs
 

diff --git a/src/Makefile.in b/src/Makefile.in
@@ -278,7 +278,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I ../m4
 SUBDIRS = ccjs
 all: all-recursive
 

diff --git a/src/ccjs/Makefile.am b/src/ccjs/Makefile.am
@@ -4,11 +4,19 @@
 #
 # ---------------------------------------------------------------------------- #
 
+ACLOCAL_AMFLAGS = -I ../../m4
+
+SUBDIRS =
+
+
+# ---------------------------------------------------------------------------- #
+
 bin_SCRIPTS = ccjs ccjs-wrap ccjs_add ccjs_remove
 
 
 # ---------------------------------------------------------------------------- #
 
+# TODO: `AC_PATH_PROGS' in `configure.ac'
 BATS       ?= bats
 BATSFLAGS  ?= --print-output-on-failure --verbose-run --timing
 BATS_TESTS ?= ./tests