Skip to content

Commit

Permalink
Added soak test category
Browse files Browse the repository at this point in the history
  • Loading branch information
ghale authored and eriwen committed May 24, 2016
1 parent 68fb722 commit fd6e30e
Show file tree
Hide file tree
Showing 11 changed files with 599 additions and 2 deletions.
5 changes: 5 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ buildTypes {
tasks "java9Test", "java9IntegTest"
projectProperties useIncomingDistributions: true
}

soakTest {
tasks "soak:soakTest"
projectProperties useIncomingDistributions: true, testAllVersions: true
}
}

apply from: "gradle/testGroupings.gradle"
Expand Down
2 changes: 1 addition & 1 deletion gradle/buildSplits.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def buckets = [
":resourcesS3", ":wrapper", ":resourcesSftp", ":signing", ":modelGroovy", ":baseServices"],

"4": [":docs", ":integTest", ":dependencyManagement", ":languageNative", ":ide", ":platformJvm", ":platformNative",
":modelCore", ":maven", ":testingNative", ":ideNative", ":native", ":installationBeacon", ":idePlay"]
":modelCore", ":maven", ":testingNative", ":ideNative", ":native", ":installationBeacon", ":idePlay", ":soak"]
]

//Make sure all projects are accounted for
Expand Down
2 changes: 1 addition & 1 deletion gradle/testGroupings.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// only the projects that contribute runtime code
ext.runtimeProjects = subprojects - [':docs', ':distributions', ':performance'].collect { project(it) }
ext.runtimeProjects = subprojects - [':docs', ':distributions', ':performance', ':soak'].collect { project(it) }

def runtimeProjectTasks = { String taskName ->
runtimeProjects.collect { it.tasks.findByPath(taskName) }.findAll { it != null }
Expand Down
1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ include 'testingJvm'
include 'platformPlay'
include 'testKit'
include 'installationBeacon'
include 'soak'

rootProject.name = 'gradle'
rootProject.children.each {project ->
Expand Down
21 changes: 21 additions & 0 deletions subprojects/soak/soak.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

useTestFixtures()
useClassycle()

dependencies {
testFixturesCompile project(':internalIntegTesting')
}

integTest {
options {
excludeCategories 'org.gradle.soak.categories.SoakTest'
}
}

task('soakTest', type: Test) {
systemProperties['org.gradle.soaktest'] = 'true'
options {
includeCategories 'org.gradle.soak.categories.SoakTest'
}
dependsOn({ rootProject.getTasksByName('publishLocalArchives', true) }, ':distributions:binZip')
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* Copyright 2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.gradle.launcher.daemon

import org.gradle.launcher.daemon.fixtures.VendorJavaVersion

import static org.gradle.launcher.daemon.fixtures.JdkVendor.*


class DaemonPerformanceMonitoringCoverage {
static def ALL_VERSIONS = [
new VendorJavaVersion(vendor: IBM, version: "1.7"),
new VendorJavaVersion(vendor: IBM, version: "1.8"),
new VendorJavaVersion(vendor: ORACLE, version: "1.7"),
new VendorJavaVersion(vendor: ORACLE, version: "1.8")
]
}
Loading

0 comments on commit fd6e30e

Please sign in to comment.