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=6bf12013d8256015ee0c3f662041ddc8ed4475b6;hp=8919fcfcf01ce2b8aabced32ee1b7ed7b111872d;hb=cf100ca71bf365d8898e97d4ec9dd05c3941cae8;hpb=2a270316e4c0afa1efe98d665e2e329b7bae6c0a

diff --git a/test/simple-build-check.sh b/test/simple-build-check.sh
old mode 100644
new mode 100755
index 8919fcfcf..6bf12013d
--- a/test/simple-build-check.sh
+++ b/test/simple-build-check.sh
@@ -1,26 +1,37 @@
 #/bin/sh
 
-EXTRA="extras/chassis_id extras/scsi_id extras/volume_id"
-
-make spotless EXTRAS="$EXTRA" >/dev/null
-make all EXTRAS="$EXTRA" || exit
-echo -e "\n\n"
-
-make spotless EXTRAS="$EXTRA" >/dev/null
-make all DEBUG=true EXTRAS="$EXTRA"  || exit
-echo -e "\n\n"
-
-make spotless EXTRAS="$EXTRA" >/dev/null
-make all USE_LOG=false EXTRAS="$EXTRA"  || exit
-echo -e "\n\n"
-
-make spotless EXTRAS="$EXTRA" >/dev/null
-make all USE_KLIBC=true DEBUG=true EXTRAS="$EXTRA" || exit
+EXTRAS="\
+	extras/path_id \
+	extras/scsi_id \
+	extras/ata_id \
+	extras/volume_id \
+	extras/usb_id \
+	extras/cdrom_id \
+	extras/edd_id \
+	extras/floppy \
+	extras/firmware \
+	extras/collect \
+	extras/rule_generator"
+
+# with debug
+make clean EXTRAS="$EXTRAS" >/dev/null
+make all -j4 $MAKEOPTS DEBUG=true EXTRAS="$EXTRAS" || exit
 echo -e "\n\n"
 
-make spotless EXTRAS="$EXTRA" >/dev/null
-make all USE_KLIBC=true USE_LOG=false EXTRAS="$EXTRA" || 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="$EXTRA" >/dev/null
-
+# 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