diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2021-11-25 11:09:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-25 11:09:11 +0100 |
| commit | d3c02dc31aafdb34a6a7203b2b4dab48ff4459fa (patch) | |
| tree | 3ed85fe57bb0c66bb4f3b73bb0d03b68fe70f640 /hosted-tenant-base | |
| parent | 45c087f569e3e51edf12753bba42a27cbda54a2a (diff) | |
| parent | a3a731a00a2d7e6f5f675258feb904bb2374c438 (diff) | |
Merge pull request #20208 from vespa-engine/jonmv/handle-missing-src-test-dir
Handle more missing parents
Diffstat (limited to 'hosted-tenant-base')
| -rw-r--r-- | hosted-tenant-base/pom.xml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index 63fbd984860..0dc7aee7cd4 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -265,16 +265,18 @@ </goals> <configuration> <tasks> - <!-- Workaround to copy src/test/application/tests only when its parent exists: - Copy in two steps: first with the parent, then eliminate it --> + <!-- Workaround to copy src/test/application/tests only when its parents exists: + Copy in two steps, eliminating the parents in the helper step--> + + <mkdir dir="target/application-test/src/test/application" /> <copy todir="target/application-test/"> - <fileset dir="src/test/" includes="application/tests/**" /> + <fileset dir="." includes="src/test/application/tests/**" /> </copy> - <mkdir dir="target/application-test/application" /> + <copy todir="target/application-test/"> - <fileset dir="target/application-test/application/" includes="tests/**" /> + <fileset dir="target/application-test/src/test/application" includes="tests/**" /> </copy> - <delete dir="target/application-test/application/" /> + <delete dir="target/application-test/src" /> <copy file="target/${project.artifactId}-tests.jar" todir="target/application-test/components/" /> <zip destfile="target/application-test.zip" basedir="target/application-test/" /> |