X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test%2Fsimple-build-check.sh;h=c5b429d98d67340abc74fca078227e3f6ffc000b;hb=0bfb84e1edd96b1e82ffd74c43b865e5d6dbf204;hp=8919fcfcf01ce2b8aabced32ee1b7ed7b111872d;hpb=2a270316e4c0afa1efe98d665e2e329b7bae6c0a;p=elogind.git

diff --git a/test/simple-build-check.sh b/test/simple-build-check.sh
old mode 100644
new mode 100755
index 8919fcfcf..c5b429d98
--- a/test/simple-build-check.sh
+++ b/test/simple-build-check.sh
@@ -1,26 +1,35 @@
 #/bin/sh
 
-EXTRA="extras/chassis_id extras/scsi_id extras/volume_id"
-
-make spotless EXTRAS="$EXTRA" >/dev/null
-make all EXTRAS="$EXTRA" || exit
+EXTRAS="\
+	extras/chassis_id \
+	extras/scsi_id \
+	extras/ata_id \
+	extras/volume_id \
+	extras/usb_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="$EXTRA" >/dev/null
-make all DEBUG=true EXTRAS="$EXTRA"  || exit
+make spotless 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_LOG=false EXTRAS="$EXTRA"  || exit
+make spotless EXTRAS="$EXTRAS" >/dev/null
+make all $MAKEOPTS USE_LOG=false EXTRAS="$EXTRAS"  || exit
 echo -e "\n\n"
 
-make spotless EXTRAS="$EXTRA" >/dev/null
-make all USE_KLIBC=true DEBUG=true EXTRAS="$EXTRA" || exit
+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"
 
-make spotless EXTRAS="$EXTRA" >/dev/null
-make all USE_KLIBC=true USE_LOG=false EXTRAS="$EXTRA" || exit
+make spotless EXTRAS="$EXTRAS" >/dev/null
+make all $MAKEOPTS USE_KLIBC=true USE_LOG=false EXTRAS="$EXTRAS" KERNEL_DIR="$KERNEL_DIR" || exit
 echo -e "\n\n"
 
-make spotless EXTRAS="$EXTRA" >/dev/null
-
+make spotless EXTRAS="$EXTRAS" >/dev/null
+echo "build test completed successfully"