summaryrefslogtreecommitdiff
path: root/tests/auto/language/testdata/required-and-nonrequired-dependencies
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2016-11-30 22:01:19 -0800
committerJake Petroules <jake.petroules@qt.io>2016-12-22 21:49:12 +0000
commit193d84079acaaaa8d9e72ab40c3c3c0d42275aec (patch)
tree6f5775536e0bf113ecaff2a767bff5933093a63d /tests/auto/language/testdata/required-and-nonrequired-dependencies
parent5a8d76c2f6006ff70bcc78853dbe95b6465851a8 (diff)
downloadqbs-193d84079acaaaa8d9e72ab40c3c3c0d42275aec.tar.gz
Move language testdata to a more sensible location
All over testdata directories are located within the tests/ hierarchy, so be consistent. Also, this simplies the exlusions list when collecting files to build for bootstrapping. Change-Id: Iab6aca8053454f8254779a3337356cf3a1cdbbec Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/language/testdata/required-and-nonrequired-dependencies')
-rw-r--r--tests/auto/language/testdata/required-and-nonrequired-dependencies/complicated.qbs7
-rw-r--r--tests/auto/language/testdata/required-and-nonrequired-dependencies/dependency-via-export.qbs15
-rw-r--r--tests/auto/language/testdata/required-and-nonrequired-dependencies/dependency-via-module.qbs6
-rw-r--r--tests/auto/language/testdata/required-and-nonrequired-dependencies/direct-dependencies.qbs6
-rw-r--r--tests/auto/language/testdata/required-and-nonrequired-dependencies/modules/failing-validation-indirect/failing-validation-indirect.qbs5
-rw-r--r--tests/auto/language/testdata/required-and-nonrequired-dependencies/modules/failing-validation/failing-validation.qbs5
-rw-r--r--tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-export-indirect.qbs22
-rw-r--r--tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-export.qbs15
-rw-r--r--tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-module.qbs6
9 files changed, 87 insertions, 0 deletions
diff --git a/tests/auto/language/testdata/required-and-nonrequired-dependencies/complicated.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/complicated.qbs
new file mode 100644
index 000000000..2173948f9
--- /dev/null
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/complicated.qbs
@@ -0,0 +1,7 @@
+import qbs
+
+Product {
+ Depends { name: "failing-validation"; required: false }
+ Depends { name: "failing-validation-indirect" }
+ Depends { name: "failing-validation-indirect"; required: false }
+}
diff --git a/tests/auto/language/testdata/required-and-nonrequired-dependencies/dependency-via-export.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/dependency-via-export.qbs
new file mode 100644
index 000000000..a4de65cbe
--- /dev/null
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/dependency-via-export.qbs
@@ -0,0 +1,15 @@
+import qbs
+
+Project {
+ Product {
+ name: "dep"
+ Export {
+ Depends { name: "failing-validation" }
+ }
+ }
+
+ Product {
+ Depends { name: "failing-validation"; required: false }
+ Depends { name: "dep" }
+ }
+}
diff --git a/tests/auto/language/testdata/required-and-nonrequired-dependencies/dependency-via-module.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/dependency-via-module.qbs
new file mode 100644
index 000000000..74ab675e3
--- /dev/null
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/dependency-via-module.qbs
@@ -0,0 +1,6 @@
+import qbs
+
+Product {
+ Depends { name: "failing-validation"; required: false }
+ Depends { name: "failing-validation-indirect" }
+}
diff --git a/tests/auto/language/testdata/required-and-nonrequired-dependencies/direct-dependencies.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/direct-dependencies.qbs
new file mode 100644
index 000000000..cf2f0f245
--- /dev/null
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/direct-dependencies.qbs
@@ -0,0 +1,6 @@
+import qbs
+
+Product {
+ Depends { name: "failing-validation"; required: false }
+ Depends { name: "failing-validation" }
+}
diff --git a/tests/auto/language/testdata/required-and-nonrequired-dependencies/modules/failing-validation-indirect/failing-validation-indirect.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/modules/failing-validation-indirect/failing-validation-indirect.qbs
new file mode 100644
index 000000000..45613b584
--- /dev/null
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/modules/failing-validation-indirect/failing-validation-indirect.qbs
@@ -0,0 +1,5 @@
+import qbs
+
+Module {
+ Depends { name: "failing-validation" }
+}
diff --git a/tests/auto/language/testdata/required-and-nonrequired-dependencies/modules/failing-validation/failing-validation.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/modules/failing-validation/failing-validation.qbs
new file mode 100644
index 000000000..dcc650b93
--- /dev/null
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/modules/failing-validation/failing-validation.qbs
@@ -0,0 +1,5 @@
+import qbs
+
+Module {
+ validate: { throw "validation error!"; }
+}
diff --git a/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-export-indirect.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-export-indirect.qbs
new file mode 100644
index 000000000..293f737c0
--- /dev/null
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-export-indirect.qbs
@@ -0,0 +1,22 @@
+import qbs
+
+Project {
+ Product {
+ name: "dep2"
+ Export {
+ Depends { name: "dep1" }
+ }
+ }
+
+ Product {
+ name: "dep1"
+ Export {
+ Depends { name: "failing-validation-indirect" }
+ }
+ }
+
+ Product {
+ Depends { name: "failing-validation"; required: false }
+ Depends { name: "dep2"; required: false }
+ }
+}
diff --git a/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-export.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-export.qbs
new file mode 100644
index 000000000..6f2ec5566
--- /dev/null
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-export.qbs
@@ -0,0 +1,15 @@
+import qbs
+
+Project {
+ Product {
+ name: "dep"
+ Export {
+ Depends { name: "failing-validation" }
+ }
+ }
+
+ Product {
+ Depends { name: "failing-validation"; required: false }
+ Depends { name: "dep"; required: false }
+ }
+}
diff --git a/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-module.qbs b/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-module.qbs
new file mode 100644
index 000000000..ecc800e7b
--- /dev/null
+++ b/tests/auto/language/testdata/required-and-nonrequired-dependencies/required-chain-module.qbs
@@ -0,0 +1,6 @@
+import qbs
+
+Product {
+ Depends { name: "failing-validation"; required: false }
+ Depends { name: "failing-validation-indirect"; required: false }
+}