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=e69c6451ab954a51278b0a5760680d0bee5655b4;hb=0518da3b74a388680896747696b3644bbd3d98e5;hpb=85701baede56edd4fba042f98550b8dec1a73127

diff --git a/test/simple-build-check.sh b/test/simple-build-check.sh
index e69c6451a..e391846de 100755
--- a/test/simple-build-check.sh
+++ b/test/simple-build-check.sh
@@ -1,49 +1,38 @@
 #/bin/sh
 
 EXTRAS="\
+	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"
+	extras/firmware \
+	extras/collect \
+	extras/rule_generator \
+	extras/fstab_import"
 
 # with debug
-make spotless EXTRAS="$EXTRAS" >/dev/null
-make all -j4 $MAKEOPTS DEBUG=true EXTRAS="$EXTRAS"  || exit
+make clean EXTRAS="$EXTRAS" >/dev/null
+make all -j4 $MAKEOPTS DEBUG=true EXTRAS="$EXTRAS" || exit
 echo -e "\n\n"
 
 # without any logging
-make spotless EXTRAS="$EXTRAS" >/dev/null
-make all $MAKEOPTS USE_LOG=false EXTRAS="$EXTRAS"  || exit
-echo -e "\n\n"
-
-# klibc and debug
-make spotless EXTRAS="$EXTRAS" >/dev/null
-make all -j4 $MAKEOPTS USE_KLIBC=true DEBUG=true EXTRAS="$EXTRAS" KERNEL_DIR="$KERNEL_DIR" || exit
-echo -e "\n\n"
-
-# klibc without logging
-make spotless EXTRAS="$EXTRAS" >/dev/null
-make all $MAKEOPTS USE_KLIBC=true USE_LOG=false EXTRAS="$EXTRAS" KERNEL_DIR="$KERNEL_DIR" || exit
+make clean EXTRAS="$EXTRAS" >/dev/null
+make all $MAKEOPTS USE_LOG=false EXTRAS="$EXTRAS" || exit
 echo -e "\n\n"
 
 # install in temporary dir and show it
 TEMPDIR="`pwd`/.tmp"
 rm -rf $TEMPDIR
 mkdir $TEMPDIR
-make spotless EXTRAS="$EXTRAS" >/dev/null
+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 spotless EXTRAS="$EXTRAS" >/dev/null
+make clean EXTRAS="$EXTRAS" >/dev/null