wafsamba: Return missing libs rather than last syslib.

[idra/samba.git] / buildtools / testwaf.sh

diff --git a/buildtools/testwaf.sh b/buildtools/testwaf.sh
index b6f8db15ef62b4b619db9a23b636ef913828d1b1..127e52589103e455423ccbc24c464d43540df9cd 100755 (executable)
--- a/buildtools/testwaf.sh
+++ b/buildtools/testwaf.sh
@@ -11,7 +11,7 @@ PREFIX=$HOME/testprefix
 if [ $# -gt 0 ]; then
     tests="$*"
 else
-    tests="lib/replace lib/talloc lib/tevent lib/tdb source4/lib/ldb"
+    tests="lib/replace lib/talloc lib/tevent lib/tdb lib/ldb"
 fi
 
 echo "testing in dirs $tests"
@@ -22,13 +22,12 @@ for d in $tests; do
     rm -rf bin
     type waf
     waf dist
-    waf configure -C --enable-developer --prefix=$PREFIX
-    time waf build
-    time waf build
-    waf install
-    waf distcheck
+    ./configure -C --enable-developer --prefix=$PREFIX
+    time make
+    make install
+    make distcheck
     case $d in
-       "source4/lib/ldb")
+       "lib/ldb")
            ldd bin/ldbadd
            ;;
        "lib/replace")
@@ -48,6 +47,11 @@ echo "testing python portability"
 pushd lib/talloc
 versions="python2.4 python2.5 python2.6 python3.0 python3.1"
 for p in $versions; do
+    ret=$(which $p || echo "failed")
+    if [ $ret = "failed" ]; then
+        echo "$p not found, skipping"
+        continue
+    fi
     echo "Testing $p"
     $p ../../buildtools/bin/waf configure -C --enable-developer --prefix=$PREFIX
     $p ../../buildtools/bin/waf build install
@@ -56,6 +60,11 @@ popd
 
 echo "testing cross compiling"
 pushd lib/talloc
-CC=arm-linux-gnueabi-gcc ./configure -C --prefix=$PREFIX  --cross-compile --cross-execute='runarm'
-make && make install
+ret=$(which arm-linux-gnueabi-gcc || echo "failed")
+if [ $ret != "failed" ]; then
+    CC=arm-linux-gnueabi-gcc ./configure -C --prefix=$PREFIX  --cross-compile --cross-execute='runarm'
+    make && make install
+else
+    echo "Cross-compiler not installed, skipping test"
+fi
 popd