From 06db5973d5264f62321a0749bd4429f9ac05e01c Mon Sep 17 00:00:00 2001 From: josecoll Date: Thu, 30 May 2019 10:09:11 +0100 Subject: [PATCH] Reduce test execution times by explicitly configure quasar package exclusions (#5161) * Reduce test execution times by explicitly configure quasar package exclusions (using new quasar util extension introduced in Corda gradle plugins 5.0.1-SNAPSHOT). * Remove SNAPSHOT from Corda gradle plugins version identifier. * Incorporating PR review feedback from CR. * Minor consolidation clean-up. * Minor consolidation clean-up. * Minor consolidation clean-up. --- build.gradle | 20 ++++++++++++++++++++ constants.properties | 2 +- core/build.gradle | 29 +++++++++++++++++++++++++++++ node/build.gradle | 29 +++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 83530fce17..80c0824088 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,26 @@ buildscript { ext.quasar_group = 'co.paralleluniverse' ext.quasar_version = constants.getProperty("quasarVersion") + ext.quasar_exclusions = [ + 'co.paralleluniverse**', + 'groovy**', + 'com.esotericsoftware.**', + 'jdk**', + 'junit**', + 'kotlin**', + 'net.rubygrapefruit.**', + 'org.gradle.**', + 'org.apache.**', + 'org.jacoco.**', + 'org.junit**', + 'org.slf4j**', + 'worker.org.gradle.**', + 'com.nhaarman.mockito_kotlin**', + 'org.assertj**', + 'org.hamcrest**', + 'org.mockito**', + 'org.opentest4j**' + ] // gradle-capsule-plugin:1.0.2 contains capsule:1.0.1 by default. // We must configure it manually to use the latest capsule version. diff --git a/constants.properties b/constants.properties index a544a1eb54..380e57db5e 100644 --- a/constants.properties +++ b/constants.properties @@ -3,7 +3,7 @@ # their own projects. So don't get fancy with syntax! cordaVersion=5.0-SNAPSHOT -gradlePluginsVersion=5.0.0 +gradlePluginsVersion=5.0.1 kotlinVersion=1.2.71 java8MinUpdateVersion=171 # ***************************************************************# diff --git a/core/build.gradle b/core/build.gradle index 673805bd2d..6479aa08bc 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -170,6 +170,35 @@ task smokeTest(type: Test) { classpath = sourceSets.smokeTest.runtimeClasspath } +// quasar exclusions upon agent code instrumentation at run-time +quasar { + excludePackages.addAll( + "antlr**", + "com.codahale**", + "com.fasterxml.**", + "com.github.benmanes.caffeine.**", + "com.google.**", + "com.lmax.**", + "com.zaxxer.**", + "net.bytebuddy**", + "io.github.classgraph**", + "io.netty*", + "liquibase**", + "net.i2p.crypto.**", + "nonapi.io.github.classgraph.**", + "org.apiguardian.**", + "org.bouncycastle**", + "org.codehaus.**", + "org.h2**", + "org.hibernate**", + "org.jboss.**", + "org.objenesis**", + "org.w3c.**", + "org.xml**", + "org.yaml**", + "rx**") +} + artifacts { testArtifacts testJar } diff --git a/node/build.gradle b/node/build.gradle index dce25c4719..523778f07f 100644 --- a/node/build.gradle +++ b/node/build.gradle @@ -226,6 +226,35 @@ task integrationTest(type: Test) { systemProperty 'testing.global.port.allocation.starting.port', 10000 } +// quasar exclusions upon agent code instrumentation at run-time +quasar { + excludePackages.addAll( + "antlr**", + "com.codahale**", + "com.fasterxml.**", + "com.github.benmanes.caffeine.**", + "com.google.**", + "com.lmax.**", + "com.zaxxer.**", + "net.bytebuddy**", + "io.github.classgraph**", + "io.netty*", + "liquibase**", + "net.i2p.crypto.**", + "nonapi.io.github.classgraph.**", + "org.apiguardian.**", + "org.bouncycastle**", + "org.codehaus.**", + "org.h2**", + "org.hibernate**", + "org.jboss.**", + "org.objenesis**", + "org.w3c.**", + "org.xml**", + "org.yaml**", + "rx**") +} + jar { baseName 'corda-node' }