From e66f91cb49d9695fe6c4b170ff6dafc6b70142b0 Mon Sep 17 00:00:00 2001 From: Gary Huang Date: Thu, 3 Jan 2019 12:16:06 -0500 Subject: [PATCH] Use stage instead of dist to skip unzipping --- .../play-ittests/play-ittests.gradle | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/dd-java-agent-ittests/play-ittests/play-ittests.gradle b/dd-java-agent-ittests/play-ittests/play-ittests.gradle index 3d79b1f89c..1b6c670841 100644 --- a/dd-java-agent-ittests/play-ittests/play-ittests.gradle +++ b/dd-java-agent-ittests/play-ittests/play-ittests.gradle @@ -83,16 +83,6 @@ def randomOpenPort() { } } -task unzip(type: Copy) { - def zipFile = file("${buildDir}/distributions/playBinary.zip") - def outputDir = file("${buildDir}/unpacked/dist") - - from zipTree(zipFile) - into outputDir - - dependsOn 'dist' -} - task startServer(type: com.github.psxpaul.task.ExecFork) { playHttpPort = randomOpenPort() @@ -100,7 +90,7 @@ task startServer(type: com.github.psxpaul.task.ExecFork) { throw new GradleException("Failed to get random port to start Play") } - workingDir = "${buildDir}/unpacked/dist/playBinary" + workingDir = "${buildDir}/stage/playBinary" commandLine = "${workingDir}/bin/playBinary" stopAfter = test // these params tells the ExecFork plugin to block on startServer task until the port is opened or the string is seen in the ouput @@ -115,11 +105,11 @@ task startServer(type: com.github.psxpaul.task.ExecFork) { + " -Dhttp.address=127.0.0.1" ] - dependsOn unzip + dependsOn 'stage' } task deletePIDFile() { - delete "${buildDir}/unpacked/dist/playBinary/RUNNING_PID" + delete "${buildDir}/stage/playBinary/RUNNING_PID" } tasks.withType(Test) {