Merge branch 'master' into devel

[omk.git] / tests / qt / runtest

diff --git a/tests/qt/runtest b/tests/qt/runtest
index 8fef771c82d7bad24555684863b1bb3e2f4f49ed..96bf360b94951257530e71af09d2a1ec7c545644 100755 (executable)
--- a/tests/qt/runtest
+++ b/tests/qt/runtest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-source ../functions.sh
+. ../functions.sh
 
 touch config.omk-default
 QTDIR=/usr/share/qt4
@@ -9,10 +9,18 @@ export QTDIR
 
 cp Makefile1.omk Makefile.omk
 make || error "QT compilation"
-[ -x qtapp/qtapp ] || error "QT application was not compiled"
+[ -x _compiled/bin/qtapp ] || error "QT application was not compiled"
 
-make distclean || error "QT distclean"
+make clean || error "QT clean 1"
 
 cp Makefile2.omk Makefile.omk
 make || error "QT Compilation in subdir"
-[ -x qtapp/qtapp ] || error "QT application was not compiled"
+[ -x _compiled/bin/qtapp ] || error "QT application was not compiled"
+
+make clean || error "QT clean 2"
+
+cp Makefile3.omk Makefile.omk
+make || error "QT_PROJECT test "
+[ -x _compiled/bin/qtapp ] || error "QT application was not compiled"
+
+make clean || error "QT clean 3"