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

"make check" without a previous "make" failed, because

checkkomspace was not built early enough.  Also, the test suite
should not fail on platforms that don't support fsusage.c.
* src/server/Makefile.am (CHECKKOMSPACE): New empty variable.
Append checkkomspace$(EXEEXT) to it if we HAVE_FSUSAGE.
(check-lyskomd): Depend on $(CHECKKOMSPACE).
(check-recursive): Ditto.
* src/server/testsuite/lyskomd.0/50.exp: Report "unsupported" if
checkkomspace is not built.  (Don't fail with fatal errors.)
parent a39f6e2c
2005-12-21 Per Cederqvist <ceder@lysator.liu.se>
"make check" without a previous "make" failed, because
checkkomspace was not built early enough. Also, the test suite
should not fail on platforms that don't support fsusage.c.
* src/server/Makefile.am (CHECKKOMSPACE): New empty variable.
Append checkkomspace$(EXEEXT) to it if we HAVE_FSUSAGE.
(check-lyskomd): Depend on $(CHECKKOMSPACE).
(check-recursive): Ditto.
* src/server/testsuite/lyskomd.0/50.exp: Report "unsupported" if
checkkomspace is not built. (Don't fail with fatal errors.)
2005-12-19 Per Cederqvist <ceder@lysator.liu.se>
Fixed test suite bitrot.
......
......@@ -54,9 +54,11 @@ AM_CPPFLAGS = \
top_srcdir = @top_srcdir@
sbin_PROGRAMS = lyskomd dbck updateLysKOM komrunning splitkomdb
CHECKKOMSPACE =
if HAVE_FSUSAGE
sbin_PROGRAMS += checkkomspace
CHECKKOMSPACE += checkkomspace$(EXEEXT)
endif
check_LIBRARIES = libcheck.a
......@@ -286,7 +288,7 @@ paths.h: $(top_srcdir)/scripts/unprefix $(top_srcdir)/scripts/definepath \
chmod 444 $@.tmp
mv -f $@.tmp $@
check-lyskomd: libcheck.a lyskomd dbck
check-lyskomd: libcheck.a lyskomd dbck $(CHECKKOMSPACE)
cd testsuite && $(MAKE) check-lyskomd
check-leaks: libcheck.a lyskomd dbck
......@@ -343,4 +345,4 @@ aux-item-def-scan.o: aux-item-def-parse.h
#
all-recursive: lyskomd$(EXEEXT) dbck$(EXEEXT)
check-recursive: libcheck.a lyskomd$(EXEEXT) dbck$(EXEEXT)
check-recursive: libcheck.a lyskomd$(EXEEXT) dbck$(EXEEXT) $(CHECKKOMSPACE)
......@@ -23,6 +23,8 @@
# Test checkkomspace.
if {[file exists ../checkkomspace]} {
# Start lyskomd.
lyskomd_start
......@@ -132,3 +134,7 @@ send "1005 44 0\n"
simple_expect "=1005"
client_death 0
lyskomd_death
} else {
unsupported "checkkomspace is not built"
}
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