Make some test tasks depending on dist

This commit is contained in:
Ilya Matveev
2018-04-22 18:37:28 +07:00
committed by ilmat192
parent b03f0bfc83
commit 772c48e61e
2 changed files with 19 additions and 3 deletions
+9 -1
View File
@@ -2664,7 +2664,7 @@ static String outputPath(SourceSet set) {
}
if (isMac() && project.testTarget != 'wasm32') {
def target = project.testTarget ?: 'host'
def target = ext.platformManager.targetByName(project.testTarget ?: 'host').name
task testValuesFramework(type: FrameworkTest) {
frameworkName = 'Values'
@@ -2672,6 +2672,10 @@ if (isMac() && project.testTarget != 'wasm32') {
framework(frameworkName, targets: [ target ]) {
srcDir 'framework/values'
baseDir outputPath(sourceSets.testOutputFramework) + "/$frameworkName"
if (!useCustomDist) {
dependsOn ":${target}CrossDistRuntime", ':commonDistRuntime', ':distCompiler'
}
}
}
swiftSources = ['framework/values/values.swift']
@@ -2684,6 +2688,10 @@ if (isMac() && project.testTarget != 'wasm32') {
framework(frameworkName, targets: [ target ]) {
srcDir 'framework/stdlib'
baseDir outputPath(sourceSets.testOutputFramework) + "/$frameworkName"
if (!useCustomDist) {
dependsOn ":${target}CrossDistRuntime", ':commonDistRuntime', ':distCompiler'
}
}
}
swiftSources = ['framework/stdlib/stdlib.swift']