Skip to content

Commit 704224f

Browse files
alexander-gorshenevminamoto79
authored andcommitted
A little refactoring on library tests
(cherry picked from commit 2ae320571f6d8d6e4208ea6edc472cacfeda4e0b)
1 parent 21d098c commit 704224f

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

backend.native/tests/build.gradle

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ allprojects {
148148
testOutputExternal.mkdirs()
149149
testOutputStdlib.mkdirs()
150150

151-
def dist = project.rootProject.file(project.findProperty("org.jetbrains.kotlin.native.home") ?:
151+
ext.dist = project.rootProject.file(project.findProperty("org.jetbrains.kotlin.native.home") ?:
152152
project.findProperty("konan.home") ?: "dist")
153153

154154
konanArtifacts {
@@ -216,6 +216,14 @@ def update_external_tests() {
216216
}
217217
}
218218

219+
void konanc(String[] args) {
220+
def konancScript = isWindows() ? "konanc.bat" : "konanc"
221+
def konanc = "$dist/bin/$konancScript"
222+
def allArgs = args.join(" ")
223+
println("$konanc $allArgs")
224+
"$konanc $allArgs".execute().waitFor()
225+
}
226+
219227
clean {
220228
doLast {
221229
delete(rootProject.file(testOutputRoot))
@@ -3946,12 +3954,10 @@ task library_mismatch(type: KonanDriverTest) {
39463954
}
39473955

39483956
doBeforeBuild {
3949-
def konancScript = isWindows() ? "konanc.bat" : "konanc"
3950-
def konanc = "$dist/bin/$konancScript"
3951-
"$konanc $lib -p library -o $dir/1.2/empty -target $currentTarget -lv 1.2".execute().waitFor()
3952-
"$konanc $lib -p library -o $dir/3.4/empty -target $someOtherTarget".execute().waitFor()
3953-
"$konanc $lib -p library -o $dir/5.6/empty -target $currentTarget -lv 5.6".execute().waitFor()
3954-
"$konanc $lib -p library -o $dir/7.8/empty -target $currentTarget -lv 7.8".execute().waitFor()
3957+
konanc("$lib -p library -o $dir/1.2/empty -target $currentTarget -lv 1.2")
3958+
konanc("$lib -p library -o $dir/3.4/empty -target $someOtherTarget")
3959+
konanc("$lib -p library -o $dir/5.6/empty -target $currentTarget -lv 5.6")
3960+
konanc("$lib -p library -o $dir/7.8/empty -target $currentTarget -lv 7.8")
39553961

39563962
}
39573963
source = "link/versioning/hello.kt"
@@ -3977,10 +3983,8 @@ task library_ir_provider_mismatch(type: KonanDriverTest) {
39773983
def currentTarget = project.target.name
39783984

39793985
doBeforeBuild {
3980-
def konancScript = isWindows() ? "konanc.bat" : "konanc"
3981-
def konanc = "$dist/bin/$konancScript"
3982-
"$konanc $lib -p library -o $dir/supported_ir_provider/empty -target $currentTarget".execute().waitFor()
3983-
"$konanc $lib -p library -o $dir/unsupported_ir_provider/empty -manifest $invalidManifest -target $currentTarget".execute().waitFor()
3986+
konanc("$lib -p library -o $dir/supported_ir_provider/empty -target $currentTarget")
3987+
konanc("$lib -p library -o $dir/unsupported_ir_provider/empty -manifest $invalidManifest -target $currentTarget")
39843988

39853989
}
39863990
source = "link/ir_providers/hello.kt"

0 commit comments

Comments
 (0)