diff options
| author | EuAndreh <eu@euandre.org> | 2021-02-28 17:28:38 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2021-02-28 17:28:38 -0300 |
| commit | 2fc6ae548e90a79c87c9d235fda30b66fe6749a0 (patch) | |
| tree | c7fb2c052d510672818fb5ed4b7c440b6c26bfb0 | |
| parent | fake-symlinks: Add assert-changelog.sh, adapt other files accordingly (diff) | |
| download | dotfiles-2fc6ae548e90a79c87c9d235fda30b66fe6749a0.tar.gz dotfiles-2fc6ae548e90a79c87c9d235fda30b66fe6749a0.tar.xz | |
fake-symlinks: Revert order of check -> dev-check dependency
| -rwxr-xr-x | aux/ci/ci-build.sh | 2 | ||||
| -rw-r--r-- | sh/templates/Makefile | 8 | ||||
| -rwxr-xr-x | sh/templates/aux/ci/ci-build.sh | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/aux/ci/ci-build.sh b/aux/ci/ci-build.sh index fb49e714..1c033fec 100755 --- a/aux/ci/ci-build.sh +++ b/aux/ci/ci-build.sh @@ -50,7 +50,7 @@ EOF RUNNER='sh -c' fi - $RUNNER 'make clean check public' + $RUNNER 'make clean dev-check public' rsync -avzzP public/ "/srv/http/$PACKAGE/" --delete } 2>&1 | tee "$LOGFILE" diff --git a/sh/templates/Makefile b/sh/templates/Makefile index b4bfe72f..e5d6e3bf 100644 --- a/sh/templates/Makefile +++ b/sh/templates/Makefile @@ -54,12 +54,8 @@ run-tests: $(headers) $(sources) tests/tests.c fallible-tests: $(headers) $(sources) tests/tests.c $(CC) $(CFLAGS) $(LDFLAGS) -DTEST -DFALLIBLE -o $@ tests/tests.c $(sources) $(LDLIBS) -lfallible -check: all +check: run-tests ./run-tests - if [ -d .git ]; then \ - echo 'Assuming Git repository, running development check.'; \ - $(MAKE) dev-check; \ - fi VALGRIND_FLAGS= \ --show-error-list=yes \ @@ -68,7 +64,7 @@ VALGRIND_FLAGS= \ --track-origins=yes \ --error-exitcode=1 -dev-check: all fallible-tests +dev-check: all check fallible-tests valgrind $(VALGRIND_FLAGS) ./run-tests fallible-check ./fallible-tests sh aux/assert-clang-format.sh diff --git a/sh/templates/aux/ci/ci-build.sh b/sh/templates/aux/ci/ci-build.sh index fb49e714..1c033fec 100755 --- a/sh/templates/aux/ci/ci-build.sh +++ b/sh/templates/aux/ci/ci-build.sh @@ -50,7 +50,7 @@ EOF RUNNER='sh -c' fi - $RUNNER 'make clean check public' + $RUNNER 'make clean dev-check public' rsync -avzzP public/ "/srv/http/$PACKAGE/" --delete } 2>&1 | tee "$LOGFILE" |