@@ -148,7 +148,7 @@ allprojects {
148
148
testOutputExternal. mkdirs()
149
149
testOutputStdlib. mkdirs()
150
150
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" ) ?:
152
152
project. findProperty(" konan.home" ) ?: " dist" )
153
153
154
154
konanArtifacts {
@@ -216,6 +216,14 @@ def update_external_tests() {
216
216
}
217
217
}
218
218
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
+
219
227
clean {
220
228
doLast {
221
229
delete(rootProject. file(testOutputRoot))
@@ -3946,12 +3954,10 @@ task library_mismatch(type: KonanDriverTest) {
3946
3954
}
3947
3955
3948
3956
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" )
3955
3961
3956
3962
}
3957
3963
source = " link/versioning/hello.kt"
@@ -3977,10 +3983,8 @@ task library_ir_provider_mismatch(type: KonanDriverTest) {
3977
3983
def currentTarget = project. target. name
3978
3984
3979
3985
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 " )
3984
3988
3985
3989
}
3986
3990
source = " link/ir_providers/hello.kt"
0 commit comments