Convert testValuesFramework into multi-file test suite
This commit is contained in:
committed by
SvyatoslavScherbina
parent
d75ddfdaf4
commit
827dc574fe
@@ -3760,9 +3760,9 @@ task library_ir_provider_mismatch(type: KonanDriverTest) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (isAppleTarget(project)) {
|
if (isAppleTarget(project)) {
|
||||||
task testValuesFramework(type: FrameworkTest) {
|
task testObjCExport(type: FrameworkTest) {
|
||||||
final String frameworkName = 'Values'
|
final String frameworkName = 'Kt'
|
||||||
testName = frameworkName
|
testName = "ObjCExport"
|
||||||
frameworkNames = [frameworkName]
|
frameworkNames = [frameworkName]
|
||||||
|
|
||||||
final String dir = "$testOutputFramework/$testName"
|
final String dir = "$testOutputFramework/$testName"
|
||||||
@@ -3770,7 +3770,7 @@ if (isAppleTarget(project)) {
|
|||||||
|
|
||||||
doLast {
|
doLast {
|
||||||
final String expectedLazyHeaderName = "expectedLazy.h"
|
final String expectedLazyHeaderName = "expectedLazy.h"
|
||||||
final String expectedLazyHeaderDir = file("framework/values/")
|
final String expectedLazyHeaderDir = file("objcexport/")
|
||||||
final File expectedLazyHeader = new File(expectedLazyHeaderDir, expectedLazyHeaderName)
|
final File expectedLazyHeader = new File(expectedLazyHeaderDir, expectedLazyHeaderName)
|
||||||
|
|
||||||
if (expectedLazyHeader.readLines() != lazyHeader.readLines()) {
|
if (expectedLazyHeader.readLines() != lazyHeader.readLines()) {
|
||||||
@@ -3792,7 +3792,7 @@ if (isAppleTarget(project)) {
|
|||||||
|
|
||||||
konanArtifacts {
|
konanArtifacts {
|
||||||
framework(frameworkName, targets: [target.name]) {
|
framework(frameworkName, targets: [target.name]) {
|
||||||
srcDir 'framework/values'
|
srcDir 'objcexport'
|
||||||
baseDir dir
|
baseDir dir
|
||||||
|
|
||||||
if (!useCustomDist) {
|
if (!useCustomDist) {
|
||||||
@@ -3804,7 +3804,9 @@ if (isAppleTarget(project)) {
|
|||||||
extraOpts project.globalTestArgs
|
extraOpts project.globalTestArgs
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
swiftSources = ['framework/values/values.swift']
|
swiftSources = fileTree('objcexport') {
|
||||||
|
include '*.swift'
|
||||||
|
}*.absolutePath
|
||||||
}
|
}
|
||||||
|
|
||||||
task testValuesGenericsFramework(type: FrameworkTest) {
|
task testValuesGenericsFramework(type: FrameworkTest) {
|
||||||
@@ -3813,7 +3815,7 @@ if (isAppleTarget(project)) {
|
|||||||
frameworkNames = [frameworkName]
|
frameworkNames = [frameworkName]
|
||||||
konanArtifacts {
|
konanArtifacts {
|
||||||
framework(frameworkName, targets: [ target ]) {
|
framework(frameworkName, targets: [ target ]) {
|
||||||
srcDir 'framework/values'
|
srcFiles 'objcexport/values.kt'
|
||||||
srcDir 'framework/values_generics'
|
srcDir 'framework/values_generics'
|
||||||
baseDir "$testOutputFramework/$testName"
|
baseDir "$testOutputFramework/$testName"
|
||||||
|
|
||||||
|
|||||||
+246
-246
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -15,7 +15,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import Foundation
|
import Foundation
|
||||||
import Values
|
import Kt
|
||||||
|
|
||||||
// -------- Tests --------
|
// -------- Tests --------
|
||||||
|
|
||||||
Reference in New Issue
Block a user