diff --git a/tests/scripts/build.gradle b/tests/scripts/build.gradle index 5f67058f191..bffbc2df9ad 100644 --- a/tests/scripts/build.gradle +++ b/tests/scripts/build.gradle @@ -16,14 +16,10 @@ * specific language governing permissions and limitations * under the License. */ - - plugins { id "de.undercouch.download" version "4.1.2" } - - task downloadShunit2(type: Download) { src 'https://github.com/kward/shunit2/archive/v2.1.7.zip' dest new File(buildDir, "shunit2-2.1.7.zip") @@ -35,9 +31,9 @@ task extractShunit2(dependsOn: downloadShunit2, type: Copy) { } task executeShTests(dependsOn: extractShunit2, type: Exec) { - workingDir "src/test/bash" commandLine "./bk_test.sh" args "-e PROJECT_BUILD_SYSTEM=gradle" } + tasks.test.dependsOn("executeShTests") diff --git a/tests/scripts/pom.xml b/tests/scripts/pom.xml index daa00cf7aa3..4bbc9e80021 100644 --- a/tests/scripts/pom.xml +++ b/tests/scripts/pom.xml @@ -66,9 +66,6 @@ ${skipTests} ${project.basedir}/src/test/bash ${project.basedir}/src/test/bash/bk_test.sh - - target - diff --git a/tests/shaded/bookkeeper-server-shaded-test/build.gradle b/tests/shaded/bookkeeper-server-shaded-test/build.gradle index c7453bed53b..78a05a3bc1e 100644 --- a/tests/shaded/bookkeeper-server-shaded-test/build.gradle +++ b/tests/shaded/bookkeeper-server-shaded-test/build.gradle @@ -24,6 +24,6 @@ plugins { dependencies { testImplementation depLibs.slf4j testImplementation depLibs.junit - testImplementation fileTree(dir: '../../../shaded/bookkeeper-server-shaded/', include: ['**/*.jar']) + testImplementation project(path: ':shaded:bookkeeper-server-shaded', configuration: 'shadow') } diff --git a/tests/shaded/bookkeeper-server-tests-shaded-test/build.gradle b/tests/shaded/bookkeeper-server-tests-shaded-test/build.gradle index eae3130f711..cc6dcd8f488 100644 --- a/tests/shaded/bookkeeper-server-tests-shaded-test/build.gradle +++ b/tests/shaded/bookkeeper-server-tests-shaded-test/build.gradle @@ -25,7 +25,7 @@ dependencies { testImplementation depLibs.slf4j testImplementation depLibs.junit testImplementation depLibs.commonsConfiguration - testImplementation project(':shaded:bookkeeper-server-shaded') - testImplementation fileTree(dir: '../../../shaded/bookkeeper-server-tests-shaded/', include: ['**/*.jar']) + testImplementation project(path: ':shaded:bookkeeper-server-shaded', configuration: 'shadow') + testImplementation project(path: ':shaded:bookkeeper-server-tests-shaded', configuration: 'shadow') } diff --git a/tests/shaded/distributedlog-core-shaded-test/build.gradle b/tests/shaded/distributedlog-core-shaded-test/build.gradle index f681150d73c..bc783ee7981 100644 --- a/tests/shaded/distributedlog-core-shaded-test/build.gradle +++ b/tests/shaded/distributedlog-core-shaded-test/build.gradle @@ -28,6 +28,6 @@ dependencies { testImplementation depLibs.powermockMockito testImplementation depLibs.powermockJunit testImplementation depLibs.commonsConfiguration - testImplementation fileTree(dir: '../../../shaded/distributedlog-core-shaded/', include: ['**/*.jar']) + testImplementation project(path: ':shaded:distributedlog-core-shaded', configuration: 'shadow') }