X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test%2Fsimple-build-check.sh;h=faa7c46432dcde340eb36ec5f3e69112ad0429b5;hb=63645a3dfce22e865b96b519fafaa2fcb489f3be;hp=e69c6451ab954a51278b0a5760680d0bee5655b4;hpb=85701baede56edd4fba042f98550b8dec1a73127;p=elogind.git

diff --git a/test/simple-build-check.sh b/test/simple-build-check.sh
index e69c6451a..faa7c4643 100755
--- a/test/simple-build-check.sh
+++ b/test/simple-build-check.sh
@@ -12,38 +12,33 @@ EXTRAS="\
 	extras/run_directory \
 	extras/firmware"
 
-[ -z "$KERNEL_DIR" ] && KERNEL_DIR=/lib/modules/`uname -r`/build
-echo KERNEL_DIR: "$KERNEL_DIR"
-
 # 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
+make clean EXTRAS="$EXTRAS" >/dev/null
+make all $MAKEOPTS USE_LOG=false EXTRAS="$EXTRAS" || 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
-echo -e "\n\n"
+# klibc build
+if [ -n "$KLCC" -a -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 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