This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle.
commit 96c38d27b11984bccdd93b4fc043bb7a05c29bb6 Author: Kai-Chung Yan <[email protected]> Date: Wed Sep 30 06:28:40 2015 +0800 Refresh disable_tests.diff --- debian/patches/disable_tests.diff | 131 ++++++++++++++++++++++---------------- 1 file changed, 75 insertions(+), 56 deletions(-) diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff index 8c05be0..ab5051c 100644 --- a/debian/patches/disable_tests.diff +++ b/debian/patches/disable_tests.diff @@ -11,11 +11,11 @@ Last-Update: 2015-09-30 -apply from: "gradle/testGroupings.gradle" apply from: "gradle/taskOrdering.gradle" apply from: "gradle/fix-GRADLE-2492.gradle" - + @@ -203,5 +201,4 @@ } } - + -apply from: "gradle/intTestImage.gradle" apply from: 'gradle/pullRequestBuild.gradle' --- a/gradle/groovyProject.gradle @@ -23,7 +23,7 @@ Last-Update: 2015-09-30 @@ -68,13 +68,16 @@ def compileConfiguration = sourceSet == "main" ? "compile" : "${sourceSet}Compile" def runtimeConfiguration = sourceSet == "main" ? "runtime" : "${sourceSet}Runtime" - + + /* dependencies { add(compileConfiguration, project(path: projectPath, configuration: "testFixturesUsageCompile")) @@ -32,7 +32,7 @@ Last-Update: 2015-09-30 } + */ } - + +/* if (file("src/testFixtures").exists()) { apply from: "$rootDir/gradle/testFixtures.gradle" @@ -40,39 +40,41 @@ Last-Update: 2015-09-30 @@ -83,6 +86,8 @@ apply from: "$rootDir/gradle/integTest.gradle" } - + +*/ + class ClasspathManifest extends DefaultTask { - + FileCollection input = project.configurations.runtime --- a/subprojects/distributions/distributions.gradle +++ b/subprojects/distributions/distributions.gradle @@ -37,8 +37,6 @@ dists } - + -daemonIntegTest.enabled = false - evaluationDependsOn ":docs" - + ext { --- a/subprojects/launcher/launcher.gradle +++ b/subprojects/launcher/launcher.gradle -@@ -14,9 +14,6 @@ - +@@ -14,11 +14,6 @@ + testCompile libraries.groovy - + - integTestCompile project(':internalIntegTesting') - integTestRuntime project(':plugins') - - testFixturesCompile project(':internalIntegTesting') - +- testFixturesCompile project(':internalIntegTesting') +- startScriptGenerator project(':plugins') -@@ -26,12 +23,6 @@ + } + +@@ -26,12 +21,6 @@ useTestFixtures(project: ':languageJava') useTestFixtures(project: ':messaging') - + -integTestTasks.all { - if (isCiServer) { - maxParallelForks = Math.min(3, rootProject.maxParallelForks) @@ -82,10 +84,10 @@ Last-Update: 2015-09-30 jar { manifest.mainAttributes('Main-Class': "org.gradle.launcher.GradleMain") doFirst { -@@ -80,11 +71,4 @@ +@@ -80,11 +69,4 @@ } } - + -daemonIntegTest { - //those tests are always using the daemon, they use exclusive daemons and they are a part of a regular check-in build anyway. - //since they are using exclusive daemons they don't contribute to the daemonIntegTest stress/load test. @@ -134,23 +136,23 @@ Last-Update: 2015-09-30 -daemonIntegTest { - enabled = false //tooling integ tests use daemon anyway, don't rerun } - + task jarjarJar(type: JarJarJar) { --- a/subprojects/wrapper/wrapper.gradle +++ b/subprojects/wrapper/wrapper.gradle @@ -18,8 +18,6 @@ - + testCompile libraries.groovy testCompile libraries.ant - - integTestRuntime rootProject.configurations.testRuntime.allDependencies } - + task buildReceiptResource(type: Copy, dependsOn: rootProject.createBuildReceipt) { @@ -35,9 +33,5 @@ from configurations.runtime.allDependencies.withType(ProjectDependency).collect { it.dependencyProject.sourceSets.main.output } } - + -integTestTasks.all { - inputs.files { project(":distributions").binZip } -} @@ -160,8 +162,8 @@ Last-Update: 2015-09-30 --- a/subprojects/scala/scala.gradle +++ b/subprojects/scala/scala.gradle @@ -24,12 +24,4 @@ - - + + testCompile libraries.slf4j_api - - integTestRuntime project(":ide") @@ -197,7 +199,7 @@ Last-Update: 2015-09-30 compile project(':core') - integTestRuntime project(':plugins') } - + useTestFixtures() --- a/subprojects/build-init/build-init.gradle +++ b/subprojects/build-init/build-init.gradle @@ -208,12 +210,12 @@ Last-Update: 2015-09-30 - integTestRuntime project(':maven') - integTestRuntime project(':scala') } - + task generateTemplateVersionFile(type: GenerateVersionProperties) { --- a/subprojects/core/core.gradle +++ b/subprojects/core/core.gradle @@ -56,16 +56,6 @@ - + testRuntime libraries.xerces testRuntime project(":diagnostics") - @@ -227,26 +229,26 @@ Last-Update: 2015-09-30 - - integTestRuntime project(":plugins") } - + useTestFixtures() --- a/subprojects/ivy/ivy.gradle +++ b/subprojects/ivy/ivy.gradle @@ -23,10 +23,6 @@ compile project(':dependencyManagement') - + testCompile libraries.groovy - integTestCompile project(":ear") - integTestRuntime project(":resourcesS3") - integTestRuntime project(":resourcesSftp") - testFixturesCompile project(":internalIntegTesting") } - + useTestFixtures() --- a/subprojects/maven/maven.gradle +++ b/subprojects/maven/maven.gradle @@ -29,12 +29,6 @@ compile "org.codehaus.plexus:plexus-component-annotations-1.5" - + testCompile libraries.xmlunit - - integTestCompile project(":ear") @@ -255,7 +257,7 @@ Last-Update: 2015-09-30 - - testFixturesCompile project(":internalIntegTesting") } - + useTestFixtures() --- a/subprojects/open-api/open-api.gradle +++ b/subprojects/open-api/open-api.gradle @@ -271,30 +273,30 @@ Last-Update: 2015-09-30 +++ b/subprojects/publish/publish.gradle @@ -19,9 +19,6 @@ compile project(':dependencyManagement') - + testCompile libraries.groovy - - integTestRuntime project(":ivy") - integTestRuntime project(":maven") } - + useTestFixtures() --- a/subprojects/reporting/reporting.gradle +++ b/subprojects/reporting/reporting.gradle @@ -14,8 +14,6 @@ compile 'com.googlecode.jatl:jatl' - + testCompile libraries.jsoup - integTestRuntime project(':codeQuality') - integTestRuntime project(':jacoco') - + reports "jquery:jquery.min:1.11.0@js" } --- a/subprojects/dependency-management/dependency-management.gradle +++ b/subprojects/dependency-management/dependency-management.gradle @@ -18,16 +18,6 @@ compile libraries.maven3 - + testCompile libraries.groovy - - integTestRuntime project(":ivy") @@ -307,7 +309,7 @@ Last-Update: 2015-09-30 - - testFixturesCompile project(":internalIntegTesting") } - + if (isWindows && javaVersion.java5) { --- a/subprojects/diagnostics/diagnostics.gradle +++ b/subprojects/diagnostics/diagnostics.gradle @@ -320,13 +322,13 @@ Last-Update: 2015-09-30 - integTestRuntime project(':platformNative') - integTestRuntime project(':languageNative') } - + useTestFixtures() --- a/subprojects/model-core/model-core.gradle +++ b/subprojects/model-core/model-core.gradle @@ -30,12 +30,6 @@ compile libraries.asm - + testCompile libraries.groovy - - integTestCompile project(":core") @@ -335,7 +337,7 @@ Last-Update: 2015-09-30 - testFixturesCompile project(":internalTesting") - testFixturesCompile project(":core") } - + useTestFixtures() --- a/subprojects/platform-native/platform-native.gradle +++ b/subprojects/platform-native/platform-native.gradle @@ -350,20 +352,20 @@ Last-Update: 2015-09-30 - - testFixturesCompile project(":internalIntegTesting") } - + useTestFixtures() --- a/subprojects/platform-jvm/platform-jvm.gradle +++ b/subprojects/platform-jvm/platform-jvm.gradle @@ -4,10 +4,6 @@ compile project(":diagnostics") - + testCompile libraries.groovy - - // To pick up JavaToolChainInternal implementation - // TODO - get rid of cycle - integTestRuntime project(':languageJava') } - + useTestFixtures() --- a/subprojects/plugin-use/plugin-use.gradle +++ b/subprojects/plugin-use/plugin-use.gradle @@ -376,41 +378,41 @@ Last-Update: 2015-09-30 - - testFixturesCompile project(":internalIntegTesting") } - + useTestFixtures() --- a/subprojects/plugins/plugins.gradle +++ b/subprojects/plugins/plugins.gradle @@ -44,8 +44,6 @@ - + testCompile "com.google.inject:guice:2.0@jar" testCompile libraries.jsoup - - integTestRuntime project(":maven") } - + evaluationDependsOn(":wrapper") --- a/subprojects/testing-native/testing-native.gradle +++ b/subprojects/testing-native/testing-native.gradle @@ -20,8 +20,6 @@ compile project(':languageNative') - + testCompile libraries.groovy - - integTestRuntime project(":ideNative") } - + useTestFixtures() --- a/subprojects/language-groovy/language-groovy.gradle +++ b/subprojects/language-groovy/language-groovy.gradle @@ -3,9 +3,6 @@ compile project(":languageJava") - + testCompile libraries.groovy - - // TODO - get rid of this cycle - integTestRuntime project(':plugins') } - + strictCompile() --- a/subprojects/language-java/language-java.gradle +++ b/subprojects/language-java/language-java.gradle @@ -422,29 +424,29 @@ Last-Update: 2015-09-30 - // TODO - get rid of this cycle - integTestRuntime project(':plugins') } - + // These public packages have classes that are tangled with the corresponding internal package. --- a/subprojects/language-jvm/language-jvm.gradle +++ b/subprojects/language-jvm/language-jvm.gradle @@ -5,8 +5,6 @@ testCompile libraries.groovy - + testRuntime project(":languageJava") - - testFixturesCompile project(":internalIntegTesting") } - + useClassycle() --- a/subprojects/language-native/language-native.gradle +++ b/subprojects/language-native/language-native.gradle @@ -19,8 +19,6 @@ compile project(':platformNative') - + testCompile libraries.groovy - - integTestRuntime project(":ideNative") } - + useTestFixtures() --- a/subprojects/platform-base/platform-base.gradle +++ b/subprojects/platform-base/platform-base.gradle @@ -454,5 +456,22 @@ Last-Update: 2015-09-30 compile project(":dependencyManagement") - testFixturesCompile project(path: ":modelCore", configuration: "testFixturesUsageRuntime") } - + + useClassycle() +--- a/subprojects/platform-play/platform-play.gradle ++++ b/subprojects/platform-play/platform-play.gradle +@@ -7,14 +7,7 @@ + compile project(":languageScala") + compile project(":javascript") + compile project(":diagnostics") +- +- testFixturesCompile project(":internalIntegTesting") + } + +-useTestFixtures() +-useTestFixtures(project: ":languageScala", sourceSet: 'integTest') +-useTestFixtures(project: ":languageJava", sourceSet: 'integTest') +-useTestFixtures(project: ":launcher", sourceSet: 'testFixtures') +- useClassycle() + strictCompile() -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
