aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/auto.pro8
-rw-r--r--tests/auto/blackbox/blackbox.pro14
-rw-r--r--tests/auto/blackbox/testdata/buildproperties_source/bp_source.qbp16
-rw-r--r--tests/auto/blackbox/testdata/buildproperties_source/main.cpp47
-rw-r--r--tests/auto/blackbox/testdata/moc_h/bla.cpp44
-rw-r--r--tests/auto/blackbox/testdata/moc_h/bla_noqobject.h43
-rw-r--r--tests/auto/blackbox/testdata/moc_h/bla_qobject.h44
-rw-r--r--tests/auto/blackbox/testdata/moc_h/i.qbp18
-rw-r--r--tests/auto/blackbox/testdata/qrc/bla.cpp42
-rw-r--r--tests/auto/blackbox/testdata/qrc/bla.qrc5
-rw-r--r--tests/auto/blackbox/testdata/qrc/i.qbp19
-rw-r--r--tests/auto/blackbox/testdata/qrc/stuff.txt1
-rw-r--r--tests/auto/blackbox/testdata/trackAddFile/after/main.cpp50
-rw-r--r--tests/auto/blackbox/testdata/trackAddFile/after/project.qbp15
-rw-r--r--tests/auto/blackbox/testdata/trackAddFile/after/zort.cpp44
-rw-r--r--tests/auto/blackbox/testdata/trackAddFile/after/zort.h47
-rw-r--r--tests/auto/blackbox/testdata/trackAddFile/before/main.cpp47
-rw-r--r--tests/auto/blackbox/testdata/trackAddFile/before/narf.cpp44
-rw-r--r--tests/auto/blackbox/testdata/trackAddFile/before/narf.h47
-rw-r--r--tests/auto/blackbox/testdata/trackAddFile/before/project.qbp11
-rw-r--r--tests/auto/blackbox/testdata/trackFileTags/after/main.cpp46
-rw-r--r--tests/auto/blackbox/testdata/trackFileTags/after/project.qbp51
-rw-r--r--tests/auto/blackbox/testdata/trackFileTags/before/main.cpp44
-rw-r--r--tests/auto/blackbox/testdata/trackFileTags/before/project.qbp51
-rw-r--r--tests/auto/blackbox/tst_blackbox.cpp395
-rw-r--r--tests/auto/dependencyFinder/dependencyFinder.pro10
-rw-r--r--tests/auto/dependencyFinder/order_basic1.qbs4
-rw-r--r--tests/auto/dependencyFinder/order_basic2.qbs5
-rw-r--r--tests/auto/dependencyFinder/order_complex1.qbs8
-rw-r--r--tests/auto/dependencyFinder/order_nodeps.qbs4
-rw-r--r--tests/auto/dependencyFinder/test1.qbs16
-rw-r--r--tests/auto/dependencyFinder/tst_dependencyFinder.cpp569
-rw-r--r--tests/auto/options/app.xml5
-rw-r--r--tests/auto/options/options.pro12
-rw-r--r--tests/auto/options/tst_options.cpp61
-rw-r--r--tests/auto/tools/tools.pro12
-rw-r--r--tests/auto/tools/tst_tools.cpp64
37 files changed, 1963 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
new file mode 100644
index 000000000..8291acce4
--- /dev/null
+++ b/tests/auto/auto.pro
@@ -0,0 +1,8 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+ options\
+ tools\
+ blackbox
+
+# dependencyFinder\
+
diff --git a/tests/auto/blackbox/blackbox.pro b/tests/auto/blackbox/blackbox.pro
new file mode 100644
index 000000000..40d1a5dea
--- /dev/null
+++ b/tests/auto/blackbox/blackbox.pro
@@ -0,0 +1,14 @@
+TEMPLATE = app
+TARGET = testBlackbox
+DEPENDPATH += .
+DESTDIR = ../../../bin/
+INCLUDEPATH += . ../../../src/lib/
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
+
+QT = core script testlib
+
+include(../../../src/lib/use.pri)
+
+SOURCES += \
+ tst_blackbox.cpp
+
diff --git a/tests/auto/blackbox/testdata/buildproperties_source/bp_source.qbp b/tests/auto/blackbox/testdata/buildproperties_source/bp_source.qbp
new file mode 100644
index 000000000..0d6cb5741
--- /dev/null
+++ b/tests/auto/blackbox/testdata/buildproperties_source/bp_source.qbp
@@ -0,0 +1,16 @@
+import qbs.base 1.0
+
+Project {
+ Product {
+ type: "application"
+ name: "HelloWorld"
+
+ Depends { name: 'cpp' }
+
+ Group {
+ cpp.defines: ['WORLD="BANANA"']
+ files : [ "main.cpp" ]
+ }
+ }
+}
+
diff --git a/tests/auto/blackbox/testdata/buildproperties_source/main.cpp b/tests/auto/blackbox/testdata/buildproperties_source/main.cpp
new file mode 100644
index 000000000..fbae63cf0
--- /dev/null
+++ b/tests/auto/blackbox/testdata/buildproperties_source/main.cpp
@@ -0,0 +1,47 @@
+/**************************************************************************
+**
+** This file is part of the Qt Build Suite
+**
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file.
+** Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**************************************************************************/
+
+#include <stdio.h>
+
+#ifndef WORLD
+# error WORLD is not defined
+#endif
+
+int main()
+{
+ puts("Hello " WORLD "!");
+}
diff --git a/tests/auto/blackbox/testdata/moc_h/bla.cpp b/tests/auto/blackbox/testdata/moc_h/bla.cpp
new file mode 100644
index 000000000..9045af23d
--- /dev/null
+++ b/tests/auto/blackbox/testdata/moc_h/bla.cpp
@@ -0,0 +1,44 @@
+/**************************************************************************
+**
+** This file is part of the Qt Build Suite
+**
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file.
+** Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**************************************************************************/
+
+#include "bla.h"
+
+int main()
+{
+ MyObject obj;
+ obj.setObjectName("I am the object!");
+}
diff --git a/tests/auto/blackbox/testdata/moc_h/bla_noqobject.h b/tests/auto/blackbox/testdata/moc_h/bla_noqobject.h
new file mode 100644
index 000000000..54e7cbd8f
--- /dev/null
+++ b/tests/auto/blackbox/testdata/moc_h/bla_noqobject.h
@@ -0,0 +1,43 @@
+/**************************************************************************
+**
+** This file is part of the Qt Build Suite
+**
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file.
+** Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**************************************************************************/
+
+#include <QObject>
+
+class MyObject : public QObject
+{
+};
+
diff --git a/tests/auto/blackbox/testdata/moc_h/bla_qobject.h b/tests/auto/blackbox/testdata/moc_h/bla_qobject.h
new file mode 100644
index 000000000..4f58ed10a
--- /dev/null
+++ b/tests/auto/blackbox/testdata/moc_h/bla_qobject.h
@@ -0,0 +1,44 @@
+/**************************************************************************
+**
+** This file is part of the Qt Build Suite
+**
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file.
+** Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**************************************************************************/
+
+#include <QObject>
+
+class MyObject : public QObject
+{
+ Q_OBJECT
+};
+
diff --git a/tests/auto/blackbox/testdata/moc_h/i.qbp b/tests/auto/blackbox/testdata/moc_h/i.qbp
new file mode 100644
index 000000000..0e103ecd9
--- /dev/null
+++ b/tests/auto/blackbox/testdata/moc_h/i.qbp
@@ -0,0 +1,18 @@
+import qbs.base 1.0
+
+Project {
+ Product {
+ type: "application"
+ name: "i"
+
+ Depends {
+ name: "Qt.core"
+ }
+
+ files: [
+ "bla.cpp",
+ "bla.h"
+ ]
+ }
+}
+
diff --git a/tests/auto/blackbox/testdata/qrc/bla.cpp b/tests/auto/blackbox/testdata/qrc/bla.cpp
new file mode 100644
index 000000000..cbb85fa03
--- /dev/null
+++ b/tests/auto/blackbox/testdata/qrc/bla.cpp
@@ -0,0 +1,42 @@
+/**************************************************************************
+**
+** This file is part of the Qt Build Suite
+**
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file.
+** Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**************************************************************************/
+
+int main()
+{
+ return 3;
+}
+
diff --git a/tests/auto/blackbox/testdata/qrc/bla.qrc b/tests/auto/blackbox/testdata/qrc/bla.qrc
new file mode 100644
index 000000000..46c93847e
--- /dev/null
+++ b/tests/auto/blackbox/testdata/qrc/bla.qrc
@@ -0,0 +1,5 @@
+<RCC>
+ <qresource prefix="/">
+ <file>stuff.txt</file>
+ </qresource>
+</RCC>
diff --git a/tests/auto/blackbox/testdata/qrc/i.qbp b/tests/auto/blackbox/testdata/qrc/i.qbp
new file mode 100644
index 000000000..11b9d1be3
--- /dev/null
+++ b/tests/auto/blackbox/testdata/qrc/i.qbp
@@ -0,0 +1,19 @@
+import qbs.base 1.0
+
+Project {
+ Product {
+ type: "application"
+ name: "i"
+
+ Depends {
+ name: "Qt.core"
+ }
+
+ files: [
+ "bla.cpp",
+ "bla.qrc",
+ "stuff.txt"
+ ]
+ }
+}
+
diff --git a/tests/auto/blackbox/testdata/qrc/stuff.txt b/tests/auto/blackbox/testdata/qrc/stuff.txt
new file mode 100644
index 000000000..78f0d32c6
--- /dev/null
+++ b/tests/auto/blackbox/testdata/qrc/stuff.txt
@@ -0,0 +1 @@
+a resource file
diff --git a/tests/auto/blackbox/testdata/trackAddFile/after/main.cpp b/tests/auto/blackbox/testdata/trackAddFile/after/main.cpp
new file mode 100644
index 000000000..749b6c2d1
--- /dev/null
+++ b/tests/auto/blackbox/testdata/trackAddFile/after/main.cpp
@@ -0,0 +1,50 @@
+/**************************************************************************
+**
+** This file is part of the Qt Build Suite
+**
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file.
+** Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**************************************************************************/
+#include "narf.h"
+#include "zort.h"
+#include <cstdio>
+
+int main(int argc, char **argv)
+{
+ printf("Hello World!\n");
+ Narf narf;
+ narf.shout();
+ Zort zort;
+ zort.shout();
+ return 0;
+}
+
diff --git a/tests/auto/blackbox/testdata/trackAddFile/after/project.qbp b/tests/auto/blackbox/testdata/trackAddFile/after/project.qbp
new file mode 100644
index 000000000..2e3a56102
--- /dev/null
+++ b/tests/auto/blackbox/testdata/trackAddFile/after/project.qbp
@@ -0,0 +1,15 @@
+import qbs.base 1.0
+
+Project {
+ Product {
+ name: 'someapp'
+ type: 'application'
+ Depends { name: 'cpp' }
+ files: [
+ "main.cpp",
+ "narf.h", "narf.cpp",
+ "zort.h", "zort.cpp"
+ ]
+ }
+}
+
diff --git a/tests/auto/blackbox/testdata/trackAddFile/after/zort.cpp b/tests/auto/blackbox/testdata/trackAddFile/after/zort.cpp
new file mode 100644
index 000000000..336ff5fda
--- /dev/null
+++ b/tests/auto/blackbox/testdata/trackAddFile/after/zort.cpp
@@ -0,0 +1,44 @@
+/**************************************************************************
+**
+** This file is part of the Qt Build Suite
+**
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file.
+** Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**************************************************************************/
+#include "zort.h"
+#include <cstdio>
+
+void Zort::shout()
+{
+ printf("ZORT!\n");
+}
+
diff --git a/tests/auto/blackbox/testdata/trackAddFile/after/zort.h b/tests/auto/blackbox/testdata/trackAddFile/after/zort.h
new file mode 100644
index 000000000..b94b70e27
--- /dev/null
+++ b/tests/auto/blackbox/testdata/trackAddFile/after/zort.h
@@ -0,0 +1,47 @@
+/**************************************************************************
+**
+** This file is part of the Qt Build Suite
+**
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file.
+** Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**************************************************************************/
+#ifndef ZORT_H
+#define ZORT_H
+
+class Zort
+{
+public:
+ void shout();
+};
+
+#endif
+
diff --git a/tests/auto/blackbox/testdata/trackAddFile/before/main.cpp b/tests/auto/blackbox/testdata/trackAddFile/before/main.cpp
new file mode 100644
index 000000000..2fec2b365
--- /dev/null
+++ b/tests/auto/blackbox/testdata/trackAddFile/before/main.cpp
@@ -0,0 +1,47 @@
+/**************************************************************************
+**
+** This file is part of the Qt Build Suite
+**
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file.
+** Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**************************************************************************/
+#include "narf.h"
+#include <cstdio>
+
+int main(int argc, char **argv)
+{
+ printf("Hello World!\n");
+ Narf narf;
+ narf.shout();
+ return 0;
+}
+
diff --git a/tests/auto/blackbox/testdata/trackAddFile/before/narf.cpp b/tests/auto/blackbox/testdata/trackAddFile/before/narf.cpp
new file mode 100644
index 000000000..5c04c9d7c
--- /dev/null
+++ b/tests/auto/blackbox/testdata/trackAddFile/before/narf.cpp
@@ -0,0 +1,44 @@
+/**************************************************************************
+**
+** This file is part of the Qt Build Suite
+**
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file.
+** Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**************************************************************************/
+#include "narf.h"
+#include <cstdio>
+
+void Narf::shout()
+{
+ printf("NARF!\n");
+}
+
diff --git a/tests/auto/blackbox/testdata/trackAddFile/before/narf.h b/tests/auto/blackbox/testdata/trackAddFile/before/narf.h
new file mode 100644
index 000000000..afc73511f
--- /dev/null
+++ b/tests/auto/blackbox/testdata/trackAddFile/before/narf.h
@@ -0,0 +1,47 @@
+/**************************************************************************
+**
+** This file is part of the Qt Build Suite
+**
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file.
+** Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**************************************************************************/
+#ifndef NARF_H
+#define NARF_H
+
+class Narf
+{
+public:
+ void shout();
+};
+
+#endif
+
diff --git a/tests/auto/blackbox/testdata/trackAddFile/before/project.qbp b/tests/auto/blackbox/testdata/trackAddFile/before/project.qbp
new file mode 100644
index 000000000..222788b6a
--- /dev/null
+++ b/tests/auto/blackbox/testdata/trackAddFile/before/project.qbp
@@ -0,0 +1,11 @@
+import qbs.base 1.0
+
+Project {
+ Product {
+ name: 'someapp'
+ type: 'application'
+ Depends { name: 'cpp' }
+ files: [ "main.cpp", "narf.h", "narf.cpp" ]
+ }
+}
+
diff --git a/tests/auto/blackbox/testdata/trackFileTags/after/main.cpp b/tests/auto/blackbox/testdata/trackFileTags/after/main.cpp
new file mode 100644
index 000000000..fb5a86b9c
--- /dev/null
+++ b/tests/auto/blackbox/testdata/trackFileTags/after/main.cpp
@@ -0,0 +1,46 @@
+/**************************************************************************
+**
+** This file is part of the Qt Build Suite
+**
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file.
+** Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**************************************************************************/
+#include <cstdio>
+
+int foo();
+
+int main(int argc, char **argv)
+{
+ printf("there's %d foo here\n", foo());
+ return 0;
+}
+
diff --git a/tests/auto/blackbox/testdata/trackFileTags/after/project.qbp b/tests/auto/blackbox/testdata/trackFileTags/after/project.qbp
new file mode 100644
index 000000000..453658e98
--- /dev/null
+++ b/tests/auto/blackbox/testdata/trackFileTags/after/project.qbp
@@ -0,0 +1,51 @@
+import qbs.base 1.0
+
+Project {
+ Product {
+ name: 'someapp'
+ type: 'application'
+ Depends { name: 'cpp' }
+ Group {
+ files: [ "main.cpp" ]
+ fileTags: [ "foosource", "cpp" ]
+ }
+ }
+
+ Rule {
+ inputs: ["foosource"]
+ Artifact {
+ fileName: input.baseName + ".foo"
+ fileTags: ["foo"]
+ }
+
+ prepare: {
+ var cmd = new JavaScriptCommand();
+ cmd.sourceCode = "var file = new TextFile(output.fileName, TextFile.WriteOnly);";
+ cmd.sourceCode += "file.truncate();"
+ cmd.sourceCode += "file.write(\"There's nothing to see here!\");"
+ cmd.sourceCode += "file.close();"
+ cmd.description = "generating something";
+ return cmd;
+ }
+ }
+
+ Rule {
+ inputs: ["foo"]
+ Artifact {
+ fileName: input.baseName + "_foo.cpp"
+ fileTags: ["cpp"]
+ }
+
+ prepare: {
+ var cmd = new JavaScriptCommand();
+ cmd.sourceCode = "var file = new TextFile(output.fileName, TextFile.WriteOnly);";
+ cmd.sourceCode += "file.truncate();";
+ cmd.sourceCode += "file.write(\"// There's nothing to see here!\\n\");";
+ cmd.sourceCode += "file.write(\"int foo() { return 15; }\\n\");";
+ cmd.sourceCode += "file.close();";
+ cmd.description = "generating something";
+ return cmd;
+ }
+ }
+}
+
diff --git a/tests/auto/blackbox/testdata/trackFileTags/before/main.cpp b/tests/auto/blackbox/testdata/trackFileTags/before/main.cpp
new file mode 100644
index 000000000..fe6c86168
--- /dev/null
+++ b/tests/auto/blackbox/testdata/trackFileTags/before/main.cpp
@@ -0,0 +1,44 @@
+/**************************************************************************
+**
+** This file is part of the Qt Build Suite
+**
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file.
+** Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**************************************************************************/
+#include <cstdio>
+
+int main(int argc, char **argv)
+{
+ printf("there's no foo here\n");
+ return 0;
+}
+
diff --git a/tests/auto/blackbox/testdata/trackFileTags/before/project.qbp b/tests/auto/blackbox/testdata/trackFileTags/before/project.qbp
new file mode 100644
index 000000000..50400f157
--- /dev/null
+++ b/tests/auto/blackbox/testdata/trackFileTags/before/project.qbp
@@ -0,0 +1,51 @@
+import qbs.base 1.0
+
+Project {
+ Product {
+ name: 'someapp'
+ type: 'application'
+ Depends { name: 'cpp' }
+ Group {
+ files: [ "main.cpp" ]
+ fileTags: [ "cpp" ]
+ }
+ }
+
+ Rule {
+ inputs: ["foosource"]
+ Artifact {
+ fileName: input.baseName + ".foo"
+ fileTags: ["foo"]
+ }
+
+ prepare: {
+ var cmd = new JavaScriptCommand();
+ cmd.sourceCode = "var file = new TextFile(output.fileName, TextFile.WriteOnly);";
+ cmd.sourceCode += "file.truncate();"
+ cmd.sourceCode += "file.write(\"There's nothing to see here!\");"
+ cmd.sourceCode += "file.close();"
+ cmd.description = "generating something";
+ return cmd;
+ }
+ }
+
+ Rule {
+ inputs: ["foo"]
+ Artifact {
+ fileName: input.baseName + "_foo.cpp"
+ fileTags: ["cpp"]
+ }
+
+ prepare: {
+ var cmd = new JavaScriptCommand();
+ cmd.sourceCode = "var file = new TextFile(output.fileName, TextFile.WriteOnly);";
+ cmd.sourceCode += "file.truncate();";
+ cmd.sourceCode += "file.write(\"// There's nothing to see here!\\n\");";
+ cmd.sourceCode += "file.write(\"int foo() { return 15; }\\n\");";
+ cmd.sourceCode += "file.close();";
+ cmd.description = "generating something";
+ return cmd;
+ }
+ }
+}
+
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
new file mode 100644
index 000000000..9bf6b7d87
--- /dev/null
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -0,0 +1,395 @@
+/**************************************************************************
+**
+** This file is part of the Qt Build Suite
+**
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file.
+** Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**************************************************************************/
+
+#include <QtCore/QFileInfo>
+#include <QtCore/QProcess>
+#include <QtCore/QFile>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QtTest>
+
+#ifdef Q_OS_LINUX
+#include <unistd.h>
+#endif
+
+class TestBlackbox : public QObject
+{
+ Q_OBJECT
+ const QString testDataDir;
+ const QString testSourceDir;
+ const QString executableSuffix;
+ const QString objectSuffix;
+public:
+ TestBlackbox()
+ : testDataDir(QCoreApplication::applicationDirPath() + "/testdata"),
+ testSourceDir(QDir::cleanPath(SRCDIR "/testdata")),
+ #ifdef Q_OS_WIN
+ executableSuffix(QLatin1String(".exe")),
+ #else
+ executableSuffix(QLatin1String("")),
+ #endif
+ #ifdef Q_OS_WIN
+ objectSuffix(QLatin1String(".obj"))
+ #else
+ objectSuffix(QLatin1String(".o"))
+ #endif
+ {
+ }
+
+protected:
+
+ int runQbs(QStringList arguments = QStringList(), bool showOutput = false)
+ {
+ QString cmdLine = QCoreApplication::applicationDirPath() + "/qbs";
+ foreach (const QString &str, arguments)
+ cmdLine += QLatin1String(" \"") + str + QLatin1Char('"');
+
+ int r;
+ if (showOutput) {
+ r = system(cmdLine.toLatin1());
+ } else {
+ QProcess process;
+ process.start(cmdLine);
+ process.waitForStarted();
+ process.waitForFinished();
+ r = process.exitCode();
+ }
+ return r;
+ }
+
+ /*!
+ Recursive copy from directory to another.
+ Note that this updates the file stamps on Linux but not on Windows.
+ */
+ void ccp(const QString &from, const QString &to)
+ {
+ QDirIterator it(from, QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden);
+ while (it.hasNext()) {
+ it.next();
+ QDir().mkpath(to + "/" + it.fileName());
+ ccp(from + "/" + it.fileName(), to + "/" + it.fileName());
+ }
+
+ QDirIterator it2(from, QDir::Files| QDir::NoDotAndDotDot | QDir::Hidden);
+ while (it2.hasNext()) {
+ it2.next();
+ const QString dstFilePath = to + "/" + it2.fileName();
+ if (QFile::exists(dstFilePath))
+ QFile::remove(dstFilePath);
+ QFile(from + "/" + it2.fileName()).copy(dstFilePath);
+ }
+ }
+
+ void rmDirR(const QString &dir)
+ {
+ QDirIterator it(dir, QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden);
+ while (it.hasNext()) {
+ QFile(it.next()).remove();
+ }
+
+ QDirIterator it2(dir, QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden);
+ while (it2.hasNext()) {
+ rmDirR(it2.next());
+ }
+ QDir().rmdir(dir);
+ }
+
+ void touch(const QString &fn)
+ {
+ QFile f(fn);
+ int s = f.size();
+ if (!f.open(QFile::ReadWrite))
+ qFatal("cannot open file %s", qPrintable(fn));
+ f.resize(s+1);
+ f.resize(s);
+ }
+
+public slots:
+ void init()
+ {
+ rmDirR(testDataDir);
+ QDir().mkpath(testDataDir);
+ ccp(testSourceDir, testDataDir);
+ }
+
+ void cleanup()
+ {
+// rmDirR(testDataDir);
+ }
+
+private slots:
+ void build_project_data()
+ {
+ QTest::addColumn<QString>("projectSubDir");
+ QTest::addColumn<QString>("productFileName");
+ QTest::newRow("BPs in Sources")
+ << QString("buildproperties_source")
+ << QString("build/debug/HelloWorld");
+ }
+
+ void build_project()
+ {
+ QFETCH(QString, projectSubDir);
+ QFETCH(QString, productFileName);
+ if (!projectSubDir.startsWith('/'))
+ projectSubDir.prepend('/');
+ QDir::setCurrent(testDataDir + projectSubDir);
+ qDebug() << "currentdir set" << testDataDir + projectSubDir;
+ qDebug() << "currentdir" << QDir::currentPath();
+ productFileName.append(executableSuffix);
+ QCOMPARE(runQbs(), 0);
+ QVERIFY(QFile::exists(productFileName));
+ QVERIFY(QFile::remove(productFileName));
+ QCOMPARE(runQbs(), 0);
+ QVERIFY(QFile::exists(productFileName));
+ }
+
+ void track_qrc()
+ {
+ QDir::setCurrent(testDataDir + "/qrc");
+ QCOMPARE(runQbs(), 0);
+ QString fileName = "build/debug/i" + executableSuffix;
+ QVERIFY(QFile(fileName).exists());
+ QDateTime dt = QFileInfo(fileName).lastModified();
+ QTest::qSleep(2020);
+ {
+ QFile f("stuff.txt");
+ f.remove();
+ QVERIFY(f.open(QFile::WriteOnly));
+ f.write("bla");
+ f.close();
+ }
+ QCOMPARE(runQbs(), 0);
+ QVERIFY(QFile(fileName).exists());
+ QVERIFY(dt < QFileInfo(fileName).lastModified());
+ }
+
+ void track_qobject_change()
+ {
+ QDir::setCurrent(testDataDir + "/moc_h");
+ QFile("bla.h").remove();
+ QVERIFY(QFile("bla_qobject.h").copy("bla.h"));
+ touch("bla.h");
+ QCOMPARE(runQbs(), 0);
+ QVERIFY(QFile("build/debug/i" + executableSuffix).exists());
+ QString moc_bla_objectFileName = "build/debug/.obj/i/GeneratedFiles/i/moc_bla" + objectSuffix;
+ QVERIFY(QFile(moc_bla_objectFileName).exists());
+
+ QTest::qSleep(1000);
+ QFile("bla.h").remove();
+ QVERIFY(QFile("bla_noqobject.h").copy("bla.h"));
+ touch("bla.h");
+ QCOMPARE(runQbs(), 0);
+ QVERIFY(QFile("build/debug/i" + executableSuffix).exists());
+ QVERIFY(!QFile(moc_bla_objectFileName).exists());
+ }
+
+ void trackAddFile()
+ {
+ QProcess process;
+ QList<QByteArray> output;
+ QDir::setCurrent(testDataDir + "/trackAddFile");
+ if (QFile::exists("work"))
+ rmDirR("work");
+ QDir().mkdir("work");
+ ccp("before", "work");
+ QDir::setCurrent(testDataDir + "/trackAddFile/work");
+ QCOMPARE(runQbs(), 0);
+
+ process.start("build/debug/someapp");
+ QVERIFY(process.waitForStarted());
+ QVERIFY(process.waitForFinished());
+ QCOMPARE(process.exitCode(), 0);
+ output = process.readAllStandardOutput().split('\n');
+ QCOMPARE(output.takeFirst().trimmed().constData(), "Hello World!");
+ QCOMPARE(output.takeFirst().trimmed().constData(), "NARF!");
+ QString unchangedObjectFile = "build/debug/someapp/narf" + objectSuffix;
+ QDateTime unchangedObjectFileTime1 = QFileInfo(unchangedObjectFile).lastModified();
+
+ QTest::qWait(1000); // for file systems with low resolution timestamps
+ ccp("../after", ".");
+ touch("project.qbp");
+ touch("main.cpp");
+ QCOMPARE(runQbs(), 0);
+
+ process.start("build/debug/someapp");
+ QVERIFY(process.waitForStarted());
+ QVERIFY(process.waitForFinished());
+ QCOMPARE(process.exitCode(), 0);
+ output = process.readAllStandardOutput().split('\n');
+ QCOMPARE(output.takeFirst().trimmed().constData(), "Hello World!");
+ QCOMPARE(output.takeFirst().trimmed().constData(), "NARF!");
+ QCOMPARE(output.takeFirst().trimmed().constData(), "ZORT!");
+
+ // the object file of the untouched source should not have changed
+ QDateTime unchangedObjectFileTime2 = QFileInfo(unchangedObjectFile).lastModified();
+ QCOMPARE(unchangedObjectFileTime1, unchangedObjectFileTime2);
+ }
+
+ void trackRemoveFile()
+ {
+ QProcess process;
+ QList<QByteArray> output;
+ QDir::setCurrent(testDataDir + "/trackAddFile");
+ if (QFile::exists("work"))
+ rmDirR("work");
+ QDir().mkdir("work");
+ ccp("before", "work");
+ ccp("after", "work");
+ QDir::setCurrent(testDataDir + "/trackAddFile/work");
+ QCOMPARE(runQbs(), 0);
+
+ process.start("build/debug/someapp");
+ QVERIFY(process.waitForStarted());
+ QVERIFY(process.waitForFinished());
+ QCOMPARE(process.exitCode(), 0);
+ output = process.readAllStandardOutput().split('\n');
+ QCOMPARE(output.takeFirst().trimmed().constData(), "Hello World!");
+ QCOMPARE(output.takeFirst().trimmed().constData(), "NARF!");
+ QCOMPARE(output.takeFirst().trimmed().constData(), "ZORT!");
+ QString unchangedObjectFile = "build/debug/someapp/narf" + objectSuffix;
+ QDateTime unchangedObjectFileTime1 = QFileInfo(unchangedObjectFile).lastModified();
+
+ QTest::qWait(1000); // for file systems with low resolution timestamps
+ QFile::remove("project.qbp");
+ QFile::remove("main.cpp");
+ ccp("../before/project.qbp", ".");
+ ccp("../before/main.cpp", ".");
+ QFile::copy("../before/project.qbp", "project.qbp");
+ QFile::copy("../before/main.cpp", "main.cpp");
+ QVERIFY(QFile::remove("zort.h"));
+ QVERIFY(QFile::remove("zort.cpp"));
+ touch("main.cpp");
+ touch("project.qbp");
+ QCOMPARE(runQbs(), 0);
+
+ process.start("build/debug/someapp");
+ QVERIFY(process.waitForStarted());
+ QVERIFY(process.waitForFinished());
+ QCOMPARE(process.exitCode(), 0);
+ output = process.readAllStandardOutput().split('\n');
+ QCOMPARE(output.takeFirst().trimmed().constData(), "Hello World!");
+ QCOMPARE(output.takeFirst().trimmed().constData(), "NARF!");
+
+ // the object file of the untouched source should not have changed
+ QDateTime unchangedObjectFileTime2 = QFileInfo(unchangedObjectFile).lastModified();
+ QCOMPARE(unchangedObjectFileTime1, unchangedObjectFileTime2);
+
+ // the object file for the removed cpp file should have vanished too
+ QCOMPARE(QFile::exists("build/debug/someapp/zort" + objectSuffix), false);
+ }
+
+ void trackAddFileTag()
+ {
+ QProcess process;
+ QList<QByteArray> output;
+ QDir::setCurrent(testDataDir + "/trackFileTags");
+ if (QFile::exists("work"))
+ rmDirR("work");
+ QDir().mkdir("work");
+ ccp("before", "work");
+ QDir::setCurrent(testDataDir + "/trackFileTags/work");
+ QCOMPARE(runQbs(), 0);
+
+ process.start("build/debug/someapp");
+ QVERIFY(process.waitForStarted());
+ QVERIFY(process.waitForFinished());
+ QCOMPARE(process.exitCode(), 0);
+ output = process.readAllStandardOutput().split('\n');
+ QCOMPARE(output.takeFirst().trimmed().constData(), "there's no foo here");
+
+ QTest::qWait(1000); // for file systems with low resolution timestamps
+ ccp("../after", ".");
+ touch("main.cpp");
+ touch("project.qbp");
+ QCOMPARE(runQbs(), 0);
+
+ process.start("build/debug/someapp");
+ QVERIFY(process.waitForStarted());
+ QVERIFY(process.waitForFinished());
+ QCOMPARE(process.exitCode(), 0);
+ output = process.readAllStandardOutput().split('\n');
+ QCOMPARE(output.takeFirst().trimmed().constData(), "there's 15 foo here");
+ }
+
+ void trackRemoveFileTag()
+ {
+ QProcess process;
+ QList<QByteArray> output;
+ QDir::setCurrent(testDataDir + "/trackFileTags");
+ if (QFile::exists("work"))
+ rmDirR("work");
+ QDir().mkdir("work");
+ ccp("after", "work");
+ QDir::setCurrent(testDataDir + "/trackFileTags/work");
+ QCOMPARE(runQbs(), 0);
+
+ // check if the artifacts are here that will become stale in the 2nd step
+ QCOMPARE(QFile::exists("build/debug/.obj/someapp/main_foo" + objectSuffix), true);
+ QCOMPARE(QFile::exists("build/debug/main_foo.cpp"), true);
+ QCOMPARE(QFile::exists("build/debug/main.foo"), true);
+
+ process.start("build/debug/someapp");
+ QVERIFY(process.waitForStarted());
+ QVERIFY(process.waitForFinished());
+ QCOMPARE(process.exitCode(), 0);
+ output = process.readAllStandardOutput().split('\n');
+ QCOMPARE(output.takeFirst().trimmed().constData(), "there's 15 foo here");
+
+ QTest::qWait(1000); // for file systems with low resolution timestamps
+ ccp("../before", ".");
+ touch("main.cpp");
+ touch("project.qbp");
+ QCOMPARE(runQbs(), 0);
+
+ process.start("build/debug/someapp");
+ QVERIFY(process.waitForStarted());
+ QVERIFY(process.waitForFinished());
+ QCOMPARE(process.exitCode(), 0);
+ output = process.readAllStandardOutput().split('\n');
+ QCOMPARE(output.takeFirst().trimmed().constData(), "there's no foo here");
+
+ // check if stale artifacts have been removed
+ QCOMPARE(QFile::exists("build/debug/someapp/main_foo" + objectSuffix), false);
+ QCOMPARE(QFile::exists("build/debug/someapp/main_foo.cpp"), false);
+ QCOMPARE(QFile::exists("build/debug/someapp/main.foo"), false);
+ }
+
+};
+
+QTEST_MAIN(TestBlackbox)
+
+#include "tst_blackbox.moc"
diff --git a/tests/auto/dependencyFinder/dependencyFinder.pro b/tests/auto/dependencyFinder/dependencyFinder.pro
new file mode 100644
index 000000000..7ecd2cbe4
--- /dev/null
+++ b/tests/auto/dependencyFinder/dependencyFinder.pro
@@ -0,0 +1,10 @@
+TEMPLATE = app
+TARGET = testDependencyFinder
+DEPENDPATH += .
+INCLUDEPATH += . ../../../src/lib/
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
+
+QT = core script testlib
+
+SOURCES += \
+ tst_dependencyFinder.cpp
diff --git a/tests/auto/dependencyFinder/order_basic1.qbs b/tests/auto/dependencyFinder/order_basic1.qbs
new file mode 100644
index 000000000..5a8529b80
--- /dev/null
+++ b/tests/auto/dependencyFinder/order_basic1.qbs
@@ -0,0 +1,4 @@
+Project {
+ foo: bar
+ bar: 2
+}
diff --git a/tests/auto/dependencyFinder/order_basic2.qbs b/tests/auto/dependencyFinder/order_basic2.qbs
new file mode 100644
index 000000000..8c0979870
--- /dev/null
+++ b/tests/auto/dependencyFinder/order_basic2.qbs
@@ -0,0 +1,5 @@
+Project {
+ bar: car
+ foo: bar
+ car: 1
+}
diff --git a/tests/auto/dependencyFinder/order_complex1.qbs b/tests/auto/dependencyFinder/order_complex1.qbs
new file mode 100644
index 000000000..aba10cacf
--- /dev/null
+++ b/tests/auto/dependencyFinder/order_complex1.qbs
@@ -0,0 +1,8 @@
+Project {
+ bar: car + foo + def
+ foo: def
+ car: foo + abc + blub
+ abc: foo + blub
+ def: 12 + blub
+ blub: 24
+}
diff --git a/tests/auto/dependencyFinder/order_nodeps.qbs b/tests/auto/dependencyFinder/order_nodeps.qbs
new file mode 100644
index 000000000..54cecaf19
--- /dev/null
+++ b/tests/auto/dependencyFinder/order_nodeps.qbs
@@ -0,0 +1,4 @@
+Project {
+ foo: 1
+ bar: 2
+}
diff --git a/tests/auto/dependencyFinder/test1.qbs b/tests/auto/dependencyFinder/test1.qbs
new file mode 100644
index 000000000..dd0e11325
--- /dev/null
+++ b/tests/auto/dependencyFinder/test1.qbs
@@ -0,0 +1,16 @@
+Module {
+ includePaths: foo + abc.def
+ foo: bar
+
+ car: {
+ var x = 12
+ x = 13
+ var aaa = function aa(x1, x2) {
+ function bbb() { bbb() }
+ x = x1 + x2 + x2.def
+ aa(x1, x2)
+ bbb();
+ }
+ return aaa(x, includePaths)
+ }
+}
diff --git a/tests/auto/dependencyFinder/tst_dependencyFinder.cpp b/tests/auto/dependencyFinder/tst_dependencyFinder.cpp
new file mode 100644
index 000000000..9c2ac693e
--- /dev/null
+++ b/tests/auto/dependencyFinder/tst_dependencyFinder.cpp
@@ -0,0 +1,569 @@
+/**************************************************************************
+**
+** This file is part of the Qt Build Suite
+**
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file.
+** Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QtScript/QScriptEngine>
+#include <QtScript/QScriptProgram>
+
+using namespace QmlJS::AST;
+
+class Function
+{
+public:
+ QString name;
+ QString code;
+};
+
+class Property
+{
+public:
+ QString name;
+ QString code;
+ QList<QStringList> dependencies;
+ QList<QStringList> sideEffects;
+};
+
+class Object
+{
+public:
+ QString prototype;
+ QList<Object> objects;
+ QHash<QString, Property> properties;
+ QHash<QString, Function> functions;
+};
+
+template <typename T>
+static QString textOf(const QString &source, T *node)
+{
+ return source.mid(node->firstSourceLocation().begin(), node->lastSourceLocation().end() - node->firstSourceLocation().begin());
+}
+
+static QList<QStringList> stripLocals(const QList<QStringList> &deps, const QStringList &locals)
+{
+ QList<QStringList> result;
+ foreach (const QStringList &dep, deps) {
+ if (!locals.contains(dep.first()))
+ result.append(dep);
+ }
+ return result;
+}
+
+// run on a statement/expression to find its deps and side effect targets
+class DependencyFinder : protected QmlJS::AST::Visitor
+{
+public:
+ DependencyFinder();
+
+ void operator()(Node *node)
+ {
+ m_deps.clear();
+ m_sideEffects.clear();
+ m_locals.clear();
+ Node::accept(node, this);
+ m_deps = stripLocals(m_deps, m_locals);
+ m_sideEffects = stripLocals(m_sideEffects, m_locals);
+ }
+
+ QList<QStringList> dependencies() const
+ {
+ return m_deps;
+ }
+
+ QList<QStringList> sideEffects() const
+ {
+ return m_sideEffects;
+ }
+
+protected:
+ using Visitor::visit;
+
+ // local vars, not external deps
+ bool visit(VariableDeclaration *ast);
+ bool visit(FunctionDeclaration *ast);
+ bool visit(FunctionExpression *ast);
+
+ // deps
+ bool visit(IdentifierExpression *ast);
+ bool visit(FieldMemberExpression *ast);
+ bool visit(ArrayMemberExpression *ast);
+
+ // side effects
+ bool visit(BinaryExpression *ast);
+ bool visit(PreIncrementExpression *ast);
+ bool visit(PostIncrementExpression *ast);
+ bool visit(PreDecrementExpression *ast);
+ bool visit(PostDecrementExpression *ast);
+
+ void sideEffectOn(ExpressionNode *ast);
+
+private:
+ QList<QSOperator::Op> m_assigningOps;
+
+ QStringList m_locals;
+ QList<QStringList> m_deps;
+ QList<QStringList> m_sideEffects;
+};
+
+DependencyFinder::DependencyFinder()
+{
+ m_assigningOps << QSOperator::Assign
+ << QSOperator::InplaceAnd
+ << QSOperator::InplaceSub
+ << QSOperator::InplaceDiv
+ << QSOperator::InplaceAdd
+ << QSOperator::InplaceLeftShift
+ << QSOperator::InplaceMod
+ << QSOperator::InplaceMul
+ << QSOperator::InplaceOr
+ << QSOperator::InplaceRightShift
+ << QSOperator::InplaceURightShift
+ << QSOperator::InplaceXor;
+}
+
+bool DependencyFinder::visit(VariableDeclaration *ast)
+{
+ if (ast->name)
+ m_locals.append(ast->name->asString());
+ return true;
+}
+
+bool DependencyFinder::visit(FunctionDeclaration *ast)
+{
+ if (ast->name)
+ m_locals.append(ast->name->asString());
+ return visit(static_cast<FunctionExpression *>(ast));
+}
+
+bool DependencyFinder::visit(FunctionExpression *ast)
+{
+ const QStringList outerLocals = m_locals;
+ m_locals.clear();
+ m_locals += QLatin1String("arguments");
+ if (ast->name)
+ m_locals += ast->name->asString();
+ for (FormalParameterList *it = ast->formals; it; it = it->next) {
+ if (it->name)
+ m_locals += it->name->asString();
+ }
+
+ const QList<QStringList> outerDeps = m_deps;
+ const QList<QStringList> outerSideEffects = m_sideEffects;
+ m_deps.clear();
+ m_sideEffects.clear();
+
+ Node::accept(ast->body, this);
+
+ m_deps = stripLocals(m_deps, m_locals);
+ m_deps += outerDeps;
+
+ m_sideEffects = stripLocals(m_sideEffects, m_locals);
+ m_sideEffects += outerSideEffects;
+
+ m_locals = outerLocals;
+ return false;
+}
+
+bool DependencyFinder::visit(IdentifierExpression *ast)
+{
+ if (ast->name)
+ m_deps += QStringList() << ast->name->asString();
+ return true;
+}
+
+class GetMemberAccess : protected Visitor
+{
+ QStringList m_result;
+
+public:
+ // gets the longest static member access, i.e.
+ // foo.bar["abc"] -> foo,bar,abc
+ // foo.bar[aaa].def -> foo.bar
+ QStringList operator()(ExpressionNode *ast)
+ {
+ m_result.clear();
+ Node::accept(ast, this);
+ return m_result;
+ }
+
+protected:
+ bool preVisit(Node *ast)
+ {
+ if (cast<FieldMemberExpression *>(ast)
+ || cast<ArrayMemberExpression *>(ast)
+ || cast<IdentifierExpression *>(ast))
+ return true;
+ m_result.clear();
+ return false;
+ }
+
+ bool visit(FieldMemberExpression *ast)
+ {
+ if (ast->name) {
+ m_result.prepend(ast->name->asString());
+ return true;
+ }
+ m_result.clear();
+ return true;
+ }
+
+ bool visit(ArrayMemberExpression *ast)
+ {
+ if (StringLiteral *string = cast<StringLiteral *>(ast->expression)) {
+ m_result.prepend(string->value->asString());
+ return true;
+ }
+ m_result.clear();
+ return true;
+ }
+
+ bool visit(IdentifierExpression *ast)
+ {
+ if (ast->name) {
+ m_result.prepend(ast->name->asString());
+ return true;
+ }
+ m_result.clear();
+ return true;
+ }
+};
+
+bool DependencyFinder::visit(FieldMemberExpression *ast)
+{
+ const QStringList dep = GetMemberAccess()(ast);
+ if (!dep.isEmpty())
+ m_deps += dep;
+ return false;
+}
+
+bool DependencyFinder::visit(ArrayMemberExpression *ast)
+{
+ const QStringList dep = GetMemberAccess()(ast);
+ if (!dep.isEmpty())
+ m_deps += dep;
+ return false;
+}
+
+void DependencyFinder::sideEffectOn(ExpressionNode *ast)
+{
+ QStringList assignee = GetMemberAccess()(ast);
+ if (!assignee.isEmpty())
+ m_sideEffects += assignee;
+ // ### does this catch everything?
+}
+
+bool DependencyFinder::visit(BinaryExpression *ast)
+{
+ if (!m_assigningOps.contains(static_cast<QSOperator::Op>(ast->op)))
+ return true;
+
+ sideEffectOn(ast->left);
+
+ // need to collect dependencies regardless, consider a = b = c = d
+ return true;
+}
+
+bool DependencyFinder::visit(PreDecrementExpression *ast)
+{
+ sideEffectOn(ast->expression);
+ return true;
+}
+
+bool DependencyFinder::visit(PostDecrementExpression *ast)
+{
+ sideEffectOn(ast->base);
+ return true;
+}
+
+bool DependencyFinder::visit(PreIncrementExpression *ast)
+{
+ sideEffectOn(ast->expression);
+ return true;
+}
+
+bool DependencyFinder::visit(PostIncrementExpression *ast)
+{
+ sideEffectOn(ast->base);
+ return true;
+}
+
+static QHash<QString, Function> bindFunctions(const QString &source, UiObjectInitializer *ast)
+{
+ QHash<QString, Function> result;
+ for (UiObjectMemberList *it = ast->members; it; it = it->next) {
+ UiSourceElement *sourceElement = cast<UiSourceElement *>(it->member);
+ if (!sourceElement)
+ continue;
+ FunctionDeclaration *fdecl = cast<FunctionDeclaration *>(sourceElement->sourceElement);
+ if (!fdecl)
+ continue;
+
+ Function f;
+ if (!fdecl->name)
+ throw Exception("function decl without name");
+ f.name = fdecl->name->asString();
+ f.code = textOf(source, fdecl);
+ result.insert(f.name, f);
+ }
+ return result;
+}
+
+static QHash<QString, Property> bindProperties(const QString &source, UiObjectInitializer *ast)
+{
+ QHash<QString, Property> result;
+ for (UiObjectMemberList *it = ast->members; it; it = it->next) {
+ if (UiScriptBinding *scriptBinding = cast<UiScriptBinding *>(it->member)) {
+ Property p;
+ if (!scriptBinding->qualifiedId || !scriptBinding->qualifiedId->name || scriptBinding->qualifiedId->next)
+ throw Exception("script binding without name or name with dots");
+ p.name = scriptBinding->qualifiedId->name->asString();
+ p.code = textOf(source, scriptBinding->statement);
+ DependencyFinder finder;
+ finder(scriptBinding->statement);
+ p.dependencies = finder.dependencies();
+ p.sideEffects = finder.sideEffects();
+ result.insert(p.name, p);
+ }
+ }
+ return result;
+}
+
+static Object bindObject(const QString &source, UiObjectDefinition *ast);
+
+static QList<Object> bindObjects(const QString &source, UiObjectInitializer *ast)
+{
+ QList<Object> result;
+ for (UiObjectMemberList *it = ast->members; it; it = it->next) {
+ if (UiObjectDefinition *objDef = cast<UiObjectDefinition *>(it->member)) {
+ result += bindObject(source, objDef);
+ }
+ }
+ return result;
+}
+
+static Object bindObject(const QString &source, UiObjectDefinition *ast)
+{
+ Object result;
+
+ if (!ast->qualifiedTypeNameId || !ast->qualifiedTypeNameId->name || ast->qualifiedTypeNameId->next)
+ throw Exception("no prototype or prototype with dots");
+ result.prototype = ast->qualifiedTypeNameId->name->asString();
+
+ result.functions = bindFunctions(source, ast->initializer);
+ result.properties = bindProperties(source, ast->initializer);
+ result.objects = bindObjects(source, ast->initializer);
+
+ return result;
+}
+
+
+class Loader
+{
+public:
+ Object readFile(const QString &fileName)
+ {
+ Object emptyReturn;
+
+ QFile file(fileName);
+ if (!file.open(QFile::ReadOnly)) {
+ qWarning() << "Couldn't open" << fileName;
+ return emptyReturn;
+ }
+
+ const QString code = QTextStream(&file).readAll();
+ QScopedPointer<QmlJS::Engine> engine(new QmlJS::Engine);
+ QScopedPointer<QmlJS::NodePool> nodePool(new QmlJS::NodePool(fileName, engine.data()));
+ QmlJS::Lexer lexer(engine.data());
+ lexer.setCode(code, 1);
+ QmlJS::Parser parser(engine.data());
+ parser.parse();
+ QList<QmlJS::DiagnosticMessage> parserMessages = parser.diagnosticMessages();
+ if (!parserMessages.isEmpty()) {
+ foreach (const QmlJS::DiagnosticMessage &msg, parserMessages)
+ qWarning() << fileName << ":" << msg.loc.startLine << ": " << msg.message;
+ return emptyReturn;
+ }
+
+ // extract dependencies without resolving them
+ UiObjectDefinition *rootDef = cast<UiObjectDefinition *>(parser.ast()->members->member);
+ if (!rootDef)
+ return emptyReturn;
+ return bindObject(code, rootDef);
+ }
+};
+
+class TestDepFinder : public QObject
+{
+ Q_OBJECT
+private slots:
+ void test1();
+ void evaluationOrder_data();
+ void evaluationOrder();
+};
+
+void TestDepFinder::test1()
+{
+ Loader loader;
+ Object object = loader.readFile(SRCDIR "test1.qbs");
+ QCOMPARE(object.properties.size(), 3);
+
+ Property includePaths = object.properties.value("includePaths");
+ QCOMPARE(includePaths.dependencies.size(), 2);
+ QCOMPARE(includePaths.dependencies.at(0), QStringList() << "foo");
+ QCOMPARE(includePaths.dependencies.at(1), QStringList() << "abc" << "def");
+ QVERIFY(includePaths.sideEffects.isEmpty());
+
+ Property foo = object.properties.value("foo");
+ QCOMPARE(foo.dependencies.size(), 1);
+ QCOMPARE(foo.dependencies.at(0), QStringList() << "bar");
+ QVERIFY(foo.sideEffects.isEmpty());
+
+ Property car = object.properties.value("car");
+ QCOMPARE(car.dependencies.size(), 1);
+ QCOMPARE(car.dependencies.at(0), QStringList() << "includePaths");
+ QVERIFY(car.sideEffects.isEmpty());
+}
+
+class ResolvedProperty
+{
+public:
+ typedef QSharedPointer<ResolvedProperty> Ptr;
+ const Object *object;
+ const Property *property;
+ QList<ResolvedProperty::Ptr> dependencies;
+};
+
+static QList<ResolvedProperty::Ptr> resolveProperties(const Object &object)
+{
+ QHash<QString, ResolvedProperty::Ptr> result;
+
+ // build initial resolved property list
+ foreach (const Property &property, object.properties) {
+ ResolvedProperty::Ptr resolvedProperty(new ResolvedProperty);
+ resolvedProperty->object = &object;
+ resolvedProperty->property = &property;
+ result.insert(property.name, resolvedProperty);
+ }
+
+ // add dependency links
+ QHashIterator<QString, ResolvedProperty::Ptr> it(result);
+ while (it.hasNext()) {
+ it.next();
+ ResolvedProperty::Ptr resolvedProperty = it.value();
+ foreach (const QStringList &dependency, resolvedProperty->property->dependencies) {
+ ResolvedProperty::Ptr rDepProp = result.value(dependency.first());
+ // ### TODO This needs serious extension:
+ // ### check globals (QScriptEngine), object.functions, parent objects?
+ if (!rDepProp) {
+ throw Exception(QString("property %1 has dependency on nonexistent property %2").arg(
+ it.key(), dependency.first()));
+ }
+ resolvedProperty->dependencies += rDepProp;
+ }
+ }
+
+ return result.values();
+}
+
+static void resolveDependencies(const ResolvedProperty::Ptr &property,
+ QList<ResolvedProperty::Ptr> *target,
+ QSet<ResolvedProperty::Ptr> *done,
+ QSet<ResolvedProperty::Ptr> *parents)
+{
+ if (done->contains(property))
+ return;
+ parents->insert(property);
+ foreach (const ResolvedProperty::Ptr &dep, property->dependencies) {
+ if (parents->contains(dep))
+ throw Exception("dependency cycle");
+ resolveDependencies(dep, target, done, parents);
+ }
+ target->append(property);
+ done->insert(property);
+ parents->remove(property);
+}
+
+static QList<ResolvedProperty::Ptr> sortForEvaluation(const QList<ResolvedProperty::Ptr> &input)
+{
+ QList<ResolvedProperty::Ptr> result;
+ QSet<ResolvedProperty::Ptr> done;
+ QSet<ResolvedProperty::Ptr> parents;
+
+ foreach (const ResolvedProperty::Ptr &property, input) {
+ resolveDependencies(property, &result, &done, &parents);
+ }
+
+ return result;
+}
+
+void TestDepFinder::evaluationOrder_data()
+{
+ QTest::addColumn<QString>("fileName");
+ QTest::addColumn<QStringList>("expectedOrder");
+ QTest::newRow("no dependencies")
+ << QString(SRCDIR "order_nodeps.qbs")
+ << (QStringList() << "foo" << "bar");
+ QTest::newRow("basic1")
+ << QString(SRCDIR "order_basic1.qbs")
+ << (QStringList() << "bar" << "foo");
+ QTest::newRow("basic2")
+ << QString(SRCDIR "order_basic2.qbs")
+ << (QStringList() << "car" << "bar" << "foo");
+ QTest::newRow("complex1")
+ << QString(SRCDIR "order_complex1.qbs")
+ << (QStringList() << "blub" << "def" << "foo" << "abc" << "car" << "bar");
+}
+
+void TestDepFinder::evaluationOrder()
+{
+ QFETCH(QString, fileName);
+ QFETCH(QStringList, expectedOrder);
+
+ Loader loader;
+ Object object = loader.readFile(fileName);
+ QCOMPARE(object.properties.size(), expectedOrder.size());
+
+ QList<ResolvedProperty::Ptr> resolvedProperties = resolveProperties(object);
+ QList<ResolvedProperty::Ptr> evaluationOrder = sortForEvaluation(resolvedProperties);
+
+ for (int i = 0; i < evaluationOrder.size(); ++i) {
+ QCOMPARE(evaluationOrder[i]->property->name, expectedOrder[i]);
+ }
+}
+
+QTEST_MAIN(TestDepFinder)
+
+#include "tst_dependencyFinder.moc"
diff --git a/tests/auto/options/app.xml b/tests/auto/options/app.xml
new file mode 100644
index 000000000..7d4099f72
--- /dev/null
+++ b/tests/auto/options/app.xml
@@ -0,0 +1,5 @@
+<Project name='brickapp' >
+ <Product name='brick'>
+ <Using package="bricklib" />
+ </Product>
+</Project>
diff --git a/tests/auto/options/options.pro b/tests/auto/options/options.pro
new file mode 100644
index 000000000..384af7f40
--- /dev/null
+++ b/tests/auto/options/options.pro
@@ -0,0 +1,12 @@
+TEMPLATE = app
+TARGET = testOptions
+DEPENDPATH += .
+INCLUDEPATH += . ../../../src/lib/
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
+
+QT = core testlib
+
+include(../../../src/lib/use.pri)
+
+SOURCES += \
+ tst_options.cpp
diff --git a/tests/auto/options/tst_options.cpp b/tests/auto/options/tst_options.cpp
new file mode 100644
index 000000000..66ab824d7
--- /dev/null
+++ b/tests/auto/options/tst_options.cpp
@@ -0,0 +1,61 @@
+/**************************************************************************
+**
+** This file is part of the Qt Build Suite
+**
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file.
+** Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**************************************************************************/
+
+#include <tools/options.h>
+#include <tools/logger.h>
+#include <QtTest/QtTest>
+
+class TestOptions : public QObject
+{
+ Q_OBJECT
+private slots:
+
+ void test()
+ {
+ QStringList args;
+ args.append("-vvvk");
+ qbs::CommandLineOptions options;
+ options.readCommandLineArguments(args);
+ QCOMPARE(qbs::Logger::instance().level(), qbs::LoggerTrace);
+ QCOMPARE(options.command(), qbs::CommandLineOptions::BuildCommand);
+ QVERIFY(options.isKeepGoingSet());
+ }
+};
+
+QTEST_APPLESS_MAIN(TestOptions)
+
+#include "tst_options.moc"
diff --git a/tests/auto/tools/tools.pro b/tests/auto/tools/tools.pro
new file mode 100644
index 000000000..27cb2cbe9
--- /dev/null
+++ b/tests/auto/tools/tools.pro
@@ -0,0 +1,12 @@
+TEMPLATE = app
+TARGET = testTools
+DEPENDPATH += .
+INCLUDEPATH += . ../../../src/lib/
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
+
+QT = core testlib
+
+include(../../../src/lib/use.pri)
+
+SOURCES += \
+ tst_tools.cpp
diff --git a/tests/auto/tools/tst_tools.cpp b/tests/auto/tools/tst_tools.cpp
new file mode 100644
index 000000000..b528ed82b
--- /dev/null
+++ b/tests/auto/tools/tst_tools.cpp
@@ -0,0 +1,64 @@
+/**************************************************************************
+**
+** This file is part of the Qt Build Suite
+**
+** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file.
+** Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**************************************************************************/
+
+#include <tools/fileinfo.h>
+#include <QtTest/QtTest>
+
+class TestFileInfo : public QObject
+{
+ Q_OBJECT
+private slots:
+
+ void testFileInfo()
+ {
+ QCOMPARE(qbs::FileInfo::fileName("C:/waffl/copter.exe"), QString("copter.exe"));
+ QCOMPARE(qbs::FileInfo::baseName("C:/waffl/copter.exe.lib"), QString("copter"));
+ QCOMPARE(qbs::FileInfo::path("abc"), QString("."));
+ QCOMPARE(qbs::FileInfo::path("/abc/lol"), QString("/abc"));
+ QVERIFY(!qbs::FileInfo::isAbsolute("bla/lol"));
+ QVERIFY(qbs::FileInfo::isAbsolute("/bla/lol"));
+#ifdef Q_OS_WIN
+ QVERIFY(qbs::FileInfo::isAbsolute("C:\\bla\\lol"));
+#endif
+ QCOMPARE(qbs::FileInfo::resolvePath("/abc/lol", "waffl"), QString("/abc/lol/waffl"));
+
+ }
+};
+
+QTEST_APPLESS_MAIN(TestFileInfo)
+
+#include "tst_tools.moc"