X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test%2Fsimple-build-check.sh;h=d1c28749fb7117b2aed55056d33c6bbf6d3789b6;hp=b653185b267cfbdeced75397e2bfb3edb526ccf3;hb=53899a171ea862124b49c75b7511b7eb30742ef9;hpb=561d4c5a3a66830ecfb92fdfd7ccee19cf01c2a7

diff --git a/test/simple-build-check.sh b/test/simple-build-check.sh
index b653185b2..d1c28749f 100755
--- a/test/simple-build-check.sh
+++ b/test/simple-build-check.sh
@@ -1,29 +1,45 @@
 #/bin/sh
 
-EXTRAS="extras/chassis_id extras/scsi_id extras/volume_id extras/run_directory"
-
-[ -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
+EXTRAS="\
+	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/firmware"
+
+# 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
+[ -z "$KLCC" ] && KLCC=/usr/bin/klcc
+if [ -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