Karim Sabri / gammalib

Commit 11cdf463dccd5a9f86734a728b54842152939810

Authored by Jürgen Knödlseder
1 parent a7168143

Avoid starting up a daemon during make installcheck (#3592)

Inline Side-by-side
Showing 2 changed files with 7 additions and 4 deletions
src/gammalib-setup.in
  View file @11cdf46
... ... @@ -194,7 +194,9 @@ elif [ $flavor = csh ]; then
194 194 fi
195 195  
196 196 #
197   -# Start gammalib daemon (will do nothing if a daemon is already running)
198   -# ======================================================================
199   -nohup gammalibd </dev/null &>/dev/null &
  197 +# Start gammalib daemon in case that we are not doing a make installcheck
  198 +# =======================================================================
  199 +if [ "x$GAMMALIB_MAKE_INSTALL_CHECK" == x ]; then
  200 + nohup gammalibd </dev/null &>/dev/null &
  201 +fi
200 202  
... ...
test/Makefile.am
  View file @11cdf46
1 1 #############################################################################
2 2 # Makefile.am for unit test module #
3 3 # ------------------------------------------------------------------------- #
4   -# Copyright (C) 2016-2021 Juergen Knoedlseder #
  4 +# Copyright (C) 2016-2022 Juergen Knoedlseder #
5 5 # ------------------------------------------------------------------------- #
6 6 # #
7 7 # This program is free software: you can redistribute it and/or modify #
... ... @@ -226,6 +226,7 @@ clean-local:
226 226 if WITH_PYTHON
227 227 installcheck-local:
228 228 @export GAMMALIB=$(DESTDIR)$(prefix); \
  229 + export GAMMALIB_MAKE_INSTALL_CHECK=yes; \
229 230 . $(DESTDIR)$(prefix)/bin/gammalib-init.sh; \
230 231 python -c 'import gammalib; gammalib.test()'; \
231 232 if test "x$$?" != "x0"; then \
... ...