X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=build%2Fcheck-customs;h=b22975055c17e92e220fb872765116b2c6c61baf;hb=d1a5b69d490ce61a0f41db08263580487720bf2f;hp=96ce568a1d3574af069d97bd68238a49c20ed3b2;hpb=c5cdbc9c4fb1e62ad7d3dd38fb992e3ba35bb95f;p=libucw.git

diff --git a/build/check-customs b/build/check-customs
index 96ce568a..b2297505 100755
--- a/build/check-customs
+++ b/build/check-customs
@@ -1,6 +1,6 @@
 #!/bin/bash
 # A script for testing compilability of different configurations
-# (c) 2004 Martin Mares <mj@ucw.cz>
+# (c) 2004--2006 Martin Mares <mj@ucw.cz>
 
 set -e
 
@@ -9,56 +9,39 @@ TEST=0
 function try
 {
 	TEST=$(($TEST+1))
-	echo "### Test $TEST: $@ ###"
-
-	CUST=$1
-	shift
-	SUBST=
-	APP="!!### Added by check-customs:"
-	while [ -n "$1" ] ; do
-		X=$1
-		Y=${X#!}
-		if [ "$X" != "$Y" ] ; then
-			SUBST="${S}/^$Y/s/^/# /;"
-		else
-			APP="$APP!$X"
+	TDIR=tests/$TEST
+	mkdir $TDIR
+	echo "### Test $TEST: $@ ###" | tee $TDIR/log
+
+	(
+		cd $TDIR
+		if ! ../../configure $@ CC=gcc-3.4 >>log 2>&1 ; then
+			echo "	CANNOT CONFIGURE"
+			exit 1
 		fi
-		shift
-	done
-	rm -rf custom
-	mkdir custom custom/lib
-	cp $CUST/lib/custom.h custom/lib/
-	cp $CUST/Makefile 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
-		echo "	FAILED"
-		exit 1
-	fi
-	echo "	PASSED"
+		if ! make >>log 2>&1 ; then
+			echo "	FAILED"
+			exit 1
+		fi
+		echo "	PASSED"
+	)
 }
 
-if [ -e custom -a ! -e custom.old ] ; then
-	mv custom custom.old
-fi
-
-rm -f test*.log
+rm -rf tests
+mkdir tests
 if [ -n "$1" ] ; then
 	try "$@"
 else
 	try free									# the free version
-	try bare !CONFIG_INDEXER !CONFIG_SEARCH						# absolutely stripped version
+	try bare -CONFIG_INDEXER -CONFIG_SEARCH						# absolutely stripped version
 	try bare									# the bare version
-	try centrum !CONFIG_GATHERER !CONFIG_GATHERD !CONFIG_SHEPHERD !CONFIG_REAPD !CONFIG_INDEXER !CONFIG_MUX !CONFIG_WATSON	# search servers
-	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
-if [ -e custom.old ] ; then
-	mv custom.old custom
+	try debug/matcher-test								# bare + custom stats and matchers
+	try centrum/cz ROLE=search1-x							# various Centrum.cz configurations
+	try centrum/cz ROLE=indexer
+	try centrum/cz ROLE=gather
+	try centrum/cz ROLE=reap+watson
+	try centrum/cz ROLE=all CONFIG_PARTMAP_IS_MMAP
+	try centrum/pl ROLE=all
+	try debug CONFIG_SHARED								# debugging configuration with shared libs
+	try debug									# debugging configuration
 fi