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=e391846de97e1639742b4b54fe951c2aa432d331;hp=0112ef78e217a849adb7c17992eac80bfdd2044a;hb=5b3ff6ba3a4009d7520920f7e529dd85d7888ccf;hpb=c1986ea33c26fc285688cfbc0a8473cd10c733ca

diff --git a/test/simple-build-check.sh b/test/simple-build-check.sh
index 0112ef78e..e391846de 100755
--- a/test/simple-build-check.sh
+++ b/test/simple-build-check.sh
@@ -1,39 +1,38 @@
 #/bin/sh
 
 EXTRAS="\
-	extras/chassis_id \
+	extras/path_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/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
+	extras/firmware \
+	extras/collect \
+	extras/rule_generator \
+	extras/fstab_import"
+
+# 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"
+# 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