azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A little refactoring on library tests

Browse Source 
(cherry picked from commit 2ae320571f6d8d6e4208ea6edc472cacfeda4e0b)
This commit is contained in:
Alexander Gorshenev
2020-05-17 04:05:09 +03:00
committed by Vasily Levchenko
parent 21d098c689
commit 704224f7a3
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/tests/build.gradle
+15 -11
View File
@@ -148,7 +148,7 @@ allprojects {
testOutputExternal.mkdirs() testOutputExternal.mkdirs()
testOutputStdlib.mkdirs() testOutputStdlib.mkdirs()
def dist = project.rootProject.file(project.findProperty("org.jetbrains.kotlin.native.home") ?: ext.dist = project.rootProject.file(project.findProperty("org.jetbrains.kotlin.native.home") ?:
project.findProperty("konan.home") ?: "dist") project.findProperty("konan.home") ?: "dist")
konanArtifacts { konanArtifacts {
@@ -216,6 +216,14 @@ def update_external_tests() {
} }
} }
void konanc(String[] args) {
def konancScript = isWindows() ? "konanc.bat" : "konanc"
def konanc = "$dist/bin/$konancScript"
def allArgs = args.join(" ")
println("$konanc $allArgs")
"$konanc $allArgs".execute().waitFor()
}
clean { clean {
doLast { doLast {
delete(rootProject.file(testOutputRoot)) delete(rootProject.file(testOutputRoot))
@@ -3946,12 +3954,10 @@ task library_mismatch(type: KonanDriverTest) {
} }
doBeforeBuild { doBeforeBuild {
def konancScript = isWindows() ? "konanc.bat" : "konanc" konanc("$lib -p library -o $dir/1.2/empty -target $currentTarget -lv 1.2")
def konanc = "$dist/bin/$konancScript" konanc("$lib -p library -o $dir/3.4/empty -target $someOtherTarget")
"$konanc $lib -p library -o $dir/1.2/empty -target $currentTarget -lv 1.2".execute().waitFor() konanc("$lib -p library -o $dir/5.6/empty -target $currentTarget -lv 5.6")
"$konanc $lib -p library -o $dir/3.4/empty -target $someOtherTarget".execute().waitFor() konanc("$lib -p library -o $dir/7.8/empty -target $currentTarget -lv 7.8")
"$konanc $lib -p library -o $dir/5.6/empty -target $currentTarget -lv 5.6".execute().waitFor()
"$konanc $lib -p library -o $dir/7.8/empty -target $currentTarget -lv 7.8".execute().waitFor()
} }
source = "link/versioning/hello.kt" source = "link/versioning/hello.kt"
@@ -3977,10 +3983,8 @@ task library_ir_provider_mismatch(type: KonanDriverTest) {
def currentTarget = project.target.name def currentTarget = project.target.name
doBeforeBuild { doBeforeBuild {
def konancScript = isWindows() ? "konanc.bat" : "konanc" konanc("$lib -p library -o $dir/supported_ir_provider/empty -target $currentTarget")
def konanc = "$dist/bin/$konancScript" konanc("$lib -p library -o $dir/unsupported_ir_provider/empty -manifest $invalidManifest -target $currentTarget")
"$konanc $lib -p library -o $dir/supported_ir_provider/empty -target $currentTarget".execute().waitFor()
"$konanc $lib -p library -o $dir/unsupported_ir_provider/empty -manifest $invalidManifest -target $currentTarget".execute().waitFor()
} }
source = "link/ir_providers/hello.kt" source = "link/ir_providers/hello.kt"