aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/language
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2013-01-07 15:48:45 +0100
committerJoerg Bornemann <joerg.bornemann@digia.com>2013-01-22 12:21:38 +0100
commit5cdf94de300e72987dfbe5c0fec5b86317ad6280 (patch)
treee484cd9ccd2faae387dd3978b6eb7783c99b84b3 /tests/auto/language
parent49060f9b1e2881a5e7801f59f6d237fd85da1ae1 (diff)
Introduce the "install" command.
This decouples building and installing, e.g. allowing the latter to be executed by a privileged user to a system-wide directory. In addition, the ability to install build artifacts (typically executables or libraries) has been added. Change-Id: I28e725e4c1168eebe88e12c75e3d3e9f5fe28ca5 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests/auto/language')
-rw-r--r--tests/auto/language/testdata/jsimportsinmultiplescopes.js2
-rw-r--r--tests/auto/language/testdata/jsimportsinmultiplescopes.qbs2
-rw-r--r--tests/auto/language/testdata/outerInGroup.qbs4
-rw-r--r--tests/auto/language/tst_language.cpp10
4 files changed, 8 insertions, 10 deletions
diff --git a/tests/auto/language/testdata/jsimportsinmultiplescopes.js b/tests/auto/language/testdata/jsimportsinmultiplescopes.js
index bd1331a0f..4e939505c 100644
--- a/tests/auto/language/testdata/jsimportsinmultiplescopes.js
+++ b/tests/auto/language/testdata/jsimportsinmultiplescopes.js
@@ -6,7 +6,7 @@ function getName(qbsModule)
return "MyProduct";
}
-function getInstallPrefix()
+function getInstallDir()
{
return "somewhere";
}
diff --git a/tests/auto/language/testdata/jsimportsinmultiplescopes.qbs b/tests/auto/language/testdata/jsimportsinmultiplescopes.qbs
index 140b093ca..388cf974b 100644
--- a/tests/auto/language/testdata/jsimportsinmultiplescopes.qbs
+++ b/tests/auto/language/testdata/jsimportsinmultiplescopes.qbs
@@ -2,6 +2,6 @@ import "jsimportsinmultiplescopes.js" as MyFunctions
Product {
name: MyFunctions.getName(qbs)
- qbs.installPrefix: MyFunctions.getInstallPrefix()
+ qbs.installDir: MyFunctions.getInstallDir()
files: "main.cpp"
}
diff --git a/tests/auto/language/testdata/outerInGroup.qbs b/tests/auto/language/testdata/outerInGroup.qbs
index b5ead48d9..50e6d13fe 100644
--- a/tests/auto/language/testdata/outerInGroup.qbs
+++ b/tests/auto/language/testdata/outerInGroup.qbs
@@ -3,12 +3,12 @@ import qbs.base 1.0
Project {
Product {
name: "OuterInGroup"
- qbs.installPrefix: "/somewhere"
+ qbs.installDir: "/somewhere"
files: ["main.cpp"]
Group {
name: "Special Group"
files: ["aboutdialog.cpp"]
- qbs.installPrefix: outer + "/else"
+ qbs.installDir: outer + "/else"
}
}
}
diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp
index 55322d2bc..460b82aa5 100644
--- a/tests/auto/language/tst_language.cpp
+++ b/tests/auto/language/tst_language.cpp
@@ -318,17 +318,15 @@ void TestLanguage::outerInGroup()
QCOMPARE(group->name, product->name);
QCOMPARE(group->files.count(), 1);
SourceArtifactConstPtr artifact = group->files.first();
- QVariant installPrefix = getConfigProperty(artifact->properties->value(),
- QStringList() << "modules" << "qbs" << "installPrefix");
- QCOMPARE(installPrefix.toString(), QString("/somewhere"));
+ QVariant installDir = artifact->properties->qbsPropertyValue("installDir");
+ QCOMPARE(installDir.toString(), QString("/somewhere"));
group = product->groups.at(1);
QVERIFY(group);
QCOMPARE(group->name, QString("Special Group"));
QCOMPARE(group->files.count(), 1);
artifact = group->files.first();
- installPrefix = getConfigProperty(artifact->properties->value(),
- QStringList() << "modules" << "qbs" << "installPrefix");
- QCOMPARE(installPrefix.toString(), QString("/somewhere/else"));
+ installDir = artifact->properties->qbsPropertyValue("installDir");
+ QCOMPARE(installDir.toString(), QString("/somewhere/else"));
}
catch (const Error &e) {
exceptionCaught = true;