Improve QT tests to check for the error fixed by Pavel recently

diff --git a/tests/qt b/tests/qt
index 2a4f6731504b70871aedf43dd0ad236f55b81577..575196a00561dfbca89b09584f6592be1f11965d 100755 (executable)
--- a/tests/qt
+++ b/tests/qt
@@ -10,12 +10,10 @@ QTDIR=/usr/share/qt4
 export QTDIR
 [ -d $QTDIR ] || canttest "Can't find QT4 instalation"
 
-cat > 'Makefile.omk' <<'EOF'
-SUBDIRS = somelib
-QT_SUBDIRS = qtapp
-EOF
-mkdir 'somelib'
-cat > 'somelib/somelib.c' <<'EOF'
+# Function to create a QT app using an OMK-built library
+function create_qt_app() {
+    mkdir 'somelib'
+    cat > 'somelib/somelib.c' <<'EOF'
 #include <header.h>
 
 int some_function(int num)
@@ -23,14 +21,14 @@ int some_function(int num)
     return SOME_CONST - num;
 }
 EOF
-cat > 'somelib/Makefile.omk' <<'EOF'
+    cat > 'somelib/Makefile.omk' <<'EOF'
 include_HEADERS = header.h
 shared_LIBRARIES = somelib
 
 
 somelib_SOURCES = somelib.c
 EOF
-cat > 'somelib/header.h' <<'EOF'
+    cat > 'somelib/header.h' <<'EOF'
 #ifndef HEADER_H
 #define HEADER_H
 
@@ -48,8 +46,8 @@ int some_function(int);
 
 #endif
 EOF
-mkdir 'qtapp'
-cat > 'qtapp/qtapp.cxx' <<'EOF'
+    mkdir 'qtapp'
+    cat > 'qtapp/qtapp.cxx' <<'EOF'
 #include <QApplication>
 #include <QPushButton>
 #include <header.h>
@@ -66,8 +64,7 @@ cat > 'qtapp/qtapp.cxx' <<'EOF'
      return app.exec();
  }
 EOF
-echo 'QT_PROJECTS=qtapp.pro' > 'qtapp/Makefile.omk'
-cat > 'qtapp/qtapp.pro' <<'EOF'
+    cat > 'qtapp/qtapp.pro' <<'EOF'
 ######################################################################
 # Automatically generated by qmake (2.01a) po ?rc 16 18:49:31 2007
 ######################################################################
@@ -81,28 +78,37 @@ INCLUDEPATH += .
 SOURCES += qtapp.cxx
 LIBS+=-lsomelib
 EOF
-omkize
-WVPASS make V=1
-WVPASS test -x _compiled/bin/qtapp
-make clean
+}
 
 ############################
-# QT Compilation in subdir #
+# The actual tests
 ############################
 
-cat > Makefile.omk <<'EOF'
-SUBDIRS = somelib dir
+WVSTART "QT_SUBDIRS in top-level Makefile.omk"
+create_qt_app
+cat > 'Makefile.omk' <<'EOF'
+SUBDIRS = somelib
+QT_SUBDIRS = qtapp
 EOF
+omkize
+WVPASS make V=1
+WVPASS test -x _compiled/bin/qtapp
+
+WVSTART "QT_SUBDIRS in a subdir"
+create_qt_app
+echo "SUBDIRS = somelib dir" > Makefile.omk
 mkdir 'dir'
-echo 'QT_SUBDIRS = ../qtapp' > 'dir/Makefile.omk'
+mv qtapp dir
+echo 'QT_SUBDIRS = qtapp' > 'dir/Makefile.omk'
 omkize
 WVPASS make
 WVPASS test -x _compiled/bin/qtapp
-make clean
 
-cat <<EOF > Makefile.omk
-SUBDIRS = somelib qtapp
-EOF
+WVSTART "QT_PROJECTS variable"
+create_qt_app
+echo 'QT_PROJECTS=qtapp.pro' > 'qtapp/Makefile.omk'
+echo "SUBDIRS = somelib qtapp" > Makefile.omk
+omkize
 WVPASS make
 WVPASS test -x _compiled/bin/qtapp