X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test%2Fsimple-build-check.sh;h=faa7c46432dcde340eb36ec5f3e69112ad0429b5;hp=742b28ec1c53d5ddc102367186f928ed46002ce9;hb=f83cccb9798d6ce70c6cc39d2100794813b3615b;hpb=bf375e3af65f0e9728516a3627613fb95288c1d1

diff --git a/test/simple-build-check.sh b/test/simple-build-check.sh
index 742b28ec1..faa7c4643 100755
--- a/test/simple-build-check.sh
+++ b/test/simple-build-check.sh
@@ -1,37 +1,44 @@
 #/bin/sh
 
 EXTRAS="\
-	extras/chassis_id \
 	extras/scsi_id \
 	extras/ata_id \
 	extras/volume_id \
 	extras/usb_id \
 	extras/dasd_id \
+	extras/cdrom_id \
+	extras/edd_id \
 	extras/floppy \
-	extras/run_directory"
+	extras/run_directory \
+	extras/firmware"
 
-[ -z "$KERNEL_DIR" ] && KERNEL_DIR=/lib/modules/`uname -r`/build
-echo KERNEL_DIR: "$KERNEL_DIR"
-
-make spotless EXTRAS="$EXTRAS" >/dev/null
-make all $MAKEOPTS EXTRAS="$EXTRAS" || exit
-echo -e "\n\n"
-
-make spotless EXTRAS="$EXTRAS" >/dev/null
-make all -j4 $MAKEOPTS DEBUG=true EXTRAS="$EXTRAS"  || exit
-echo -e "\n\n"
-
-make spotless EXTRAS="$EXTRAS" >/dev/null
-make all $MAKEOPTS USE_LOG=false EXTRAS="$EXTRAS"  || exit
-echo -e "\n\n"
-
-make spotless EXTRAS="$EXTRAS" >/dev/null
-make all -j4 $MAKEOPTS USE_KLIBC=true DEBUG=true EXTRAS="$EXTRAS" KERNEL_DIR="$KERNEL_DIR" || exit
+# with debug
+make clean EXTRAS="$EXTRAS" >/dev/null
+make all -j4 $MAKEOPTS DEBUG=true EXTRAS="$EXTRAS" || exit
 echo -e "\n\n"
 
-make spotless EXTRAS="$EXTRAS" >/dev/null
-make all $MAKEOPTS USE_KLIBC=true USE_LOG=false EXTRAS="$EXTRAS" KERNEL_DIR="$KERNEL_DIR" || exit
+# without any logging
+make clean EXTRAS="$EXTRAS" >/dev/null
+make all $MAKEOPTS USE_LOG=false EXTRAS="$EXTRAS" || exit
 echo -e "\n\n"
 
-make spotless EXTRAS="$EXTRAS" >/dev/null
-echo "build test completed successfully"
+# klibc build
+if [ -n "$KLCC" -a -e "$KLCC" ]; then
+	echo KLCC: "$KLCC"
+	make clean EXTRAS="$EXTRAS" >/dev/null
+	make all -j4 $MAKEOPTS USE_KLIBC=true DEBUG=true EXTRAS="$EXTRAS" KLCC="$KLCC" || exit
+	echo -e "\n\n"
+fi
+
+# install in temporary dir and show it
+TEMPDIR="`pwd`/.tmp"
+rm -rf $TEMPDIR
+mkdir $TEMPDIR
+make clean EXTRAS="$EXTRAS" >/dev/null
+make all $MAKEOPTS DESTDIR="$TEMPDIR" EXTRAS="$EXTRAS" || exit
+make install DESTDIR="$TEMPDIR" EXTRAS="$EXTRAS" || exit
+echo -e "\nInstalled tree:"
+find $TEMPDIR
+rm -rf $TEMPDIR
+
+make clean EXTRAS="$EXTRAS" >/dev/null