X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=build%2Fcheck-customs;h=237437a5c88fdc2b7e8ed969579ebe0307c3c26c;hb=55c100a5accca712671adcd10e81db6c1a20b8d4;hp=d36fb36693f9e38c491fef67ea09437a08d7256e;hpb=12c7889013170672f8f1db637ae82ede4bdb12d9;p=libucw.git

diff --git a/build/check-customs b/build/check-customs
index d36fb366..237437a5 100755
--- a/build/check-customs
+++ b/build/check-customs
@@ -9,7 +9,8 @@ TEST=0
 function try
 {
 	TEST=$(($TEST+1))
-	echo "### Test $TEST: $@ ###"
+	LOG=test$TEST.log
+	echo "### Test $TEST: $@ ###" | tee $LOG
 
 	CUST=$1
 	shift
@@ -26,14 +27,13 @@ function try
 		shift
 	done
 	rm -rf custom
-	mkdir custom custom/lib
-	cp $CUST/lib/custom.h custom/lib/
-	cp $CUST/Makefile custom/
+	cp -a $CUST custom
 	sed "$SUBST;p;d" <$CUST/config.mk >custom/config.mk
 	echo $APP | tr ! '\n' >>custom/config.mk
 
-	make clean >test$TEST.log 2>&1
-	if ! make >>test$TEST.log 2>&1 ; then
+	make clean >>$LOG 2>&1
+	rm run/cf/*
+	if ! make >>$LOG 2>&1 ; then
 		echo "	FAILED"
 		exit 1
 	fi
@@ -48,7 +48,6 @@ rm -f test*.log
 if [ -n "$1" ] ; then
 	try "$@"
 else
-	try debug/custom								# debugging configuration
 	try free									# the free version
 	try bare !CONFIG_INDEXER !CONFIG_SEARCH						# absolutely stripped version
 	try bare									# the bare version
@@ -56,6 +55,7 @@ else
 	try centrum !CONFIG_GATHERER !CONFIG_GATHERD !CONFIG_SHEPHERD !CONFIG_REAPD !CONFIG_MUX !CONFIG_WATSON	# indexing server
 	try centrum !CONFIG_GATHERD !CONFIG_SHEPHERD !CONFIG_INDEXER !CONFIG_SEARCH !CONFIG_MUX !CONFIG_WATSON	# reapd server
 	try centrum 		 							# full Centrum config
+	try debug/custom								# debugging configuration
 fi
 
 rm -rf custom