diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-05-08 11:30:13 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-05-09 16:51:40 +0000 |
| commit | 9d2f9d85d07fffa82f4e832d1810d163104d07e5 (patch) | |
| tree | d43d121c23c979f02ba5f039fa715b96a7dfb0ef /tests | |
| parent | 2bde55de3926567daa58c9fd279c7e6022a5802f (diff) | |
Track Java manifest files as artifacts in the build graph
Change-Id: I4e5df616d49b51286a3df83f11807408b59c4fe3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests')
4 files changed, 13 insertions, 1 deletions
diff --git a/tests/auto/blackbox/testdata-java/java/Manifest.mf b/tests/auto/blackbox/testdata-java/java/Manifest.mf new file mode 100644 index 000000000..2da157c8b --- /dev/null +++ b/tests/auto/blackbox/testdata-java/java/Manifest.mf @@ -0,0 +1 @@ +Some-Property: Some-Value diff --git a/tests/auto/blackbox/testdata-java/java/Manifest2.mf b/tests/auto/blackbox/testdata-java/java/Manifest2.mf new file mode 100644 index 000000000..17433ea7e --- /dev/null +++ b/tests/auto/blackbox/testdata-java/java/Manifest2.mf @@ -0,0 +1,2 @@ +Some-Property: Some-Value +Additional-Property: Additional-Value diff --git a/tests/auto/blackbox/testdata-java/java/vehicles.qbs b/tests/auto/blackbox/testdata-java/java/vehicles.qbs index 0a8c4a62e..2e048c634 100644 --- a/tests/auto/blackbox/testdata-java/java/vehicles.qbs +++ b/tests/auto/blackbox/testdata-java/java/vehicles.qbs @@ -86,7 +86,13 @@ Project { Depends { name: "native" } name: "jar_file" entryPoint: "Vehicles" - files: ["Jet.java", "Ship.java", "Vehicles.java"] + files: ["Jet.java", "Ship.java", "Vehicles.java", "Manifest.mf", "Manifest2.mf"] + + java.manifest: { + var mf = original; + mf["Extra-Property"] = "Crazy-Value"; + return mf; + } Group { fileTagsFilter: ["java.jar"] diff --git a/tests/auto/blackbox/tst_blackboxjava.cpp b/tests/auto/blackbox/tst_blackboxjava.cpp index 1f397b800..097fabca8 100644 --- a/tests/auto/blackbox/tst_blackboxjava.cpp +++ b/tests/auto/blackbox/tst_blackboxjava.cpp @@ -199,6 +199,9 @@ void TestBlackboxJava::java() const QByteArray stdOut = process.readAllStandardOutput(); QVERIFY2(stdOut.contains("Class-Path: car_jar.jar random_stuff.jar"), stdOut.constData()); QVERIFY2(stdOut.contains("Main-Class: Vehicles"), stdOut.constData()); + QVERIFY2(stdOut.contains("Some-Property: Some-Value"), stdOut.constData()); + QVERIFY2(stdOut.contains("Additional-Property: Additional-Value"), stdOut.constData()); + QVERIFY2(stdOut.contains("Extra-Property: Crazy-Value"), stdOut.constData()); } } |