Commit d54ccb2e authored by Per Cederqvist's avatar Per Cederqvist
Browse files

(check-lyskomd): Only perform the tests if HAVE_PYTHON is set. Use

	$(PYTHON) instead of python.  Print a warning if HAVE_PYTHON
	isn't set.
(check-leaks): Ditto.
(site.exp): Set python to the Python interpreter found by configure.
parent c3449c7c
# $Id: Makefile.am,v 1.62 2003/08/13 13:29:35 ceder Exp $
# $Id: Makefile.am,v 1.63 2003/08/13 20:38:56 ceder Exp $
# Copyright (C) 1998-2002 Lysator Academic Computer Association.
#
# This file is part of the LysKOM server.
......@@ -131,8 +131,15 @@ check-l2g: test-l2g site.exp valgrind.wrap
runtest --tool l2g --srcdir $(srcdir)
check-lyskomd: site.exp ../lyskomd valgrind.wrap bignum timeval-overflow
if HAVE_PYTHON
runtest --tool lyskomd --srcdir $(srcdir) \
3<&- 4<&- 5<&- 6<&- 7<&- 8<&- 9<&-
else
@echo >&2
@echo WARNING: no python interpreter was found by configure, so >&2
@echo most tests could not be run. >&2
@echo >&2
endif
# We need to build all test cases in lyskomd.0 before running check-lyskomd.
# I have found no better way to express that check-lyskomd depends on
......@@ -140,8 +147,15 @@ check-lyskomd: site.exp ../lyskomd valgrind.wrap bignum timeval-overflow
check-lyskomd: check-recursive
check-leaks: site.exp ../lyskomd valgrind.wrap
if HAVE_PYTHON
runtest --tool leaks --srcdir $(srcdir) \
3<&- 4<&- 5<&- 6<&- 7<&- 8<&- 9<&-
else
@echo >&2
@echo WARNING: no python interpreter was found by configure, so >&2
@echo most tests could not be run. >&2
@echo >&2
endif
check-testfd: testfd
./testfd
......@@ -168,6 +182,7 @@ site.exp: Makefile
|| echo 1.0.0.127.in-addr.arpa PTR 127.0.0.1) \
| sed -e 's/.*PTR /set lyskomd_host "/' -e 's/$$/"/' -e q >> $@.tmp
echo set valgrind_fd $(VALGRIND_FD) >> $@.tmp
echo set python \"$(PYTHON)\" >> $@.tmp
chmod 444 $@.tmp
mv $@.tmp $@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment