[build][workaround] for issue with function reference

This commit is contained in:
Vasily Levchenko
2020-03-09 18:08:51 +01:00
parent bbfde042e9
commit 62f7f010b8
2 changed files with 4 additions and 4 deletions
@@ -152,7 +152,7 @@ open class KonanGTest : KonanTest() {
override fun run() { override fun run() {
doBeforeRun?.execute(this) doBeforeRun?.execute(this)
runProcess( runProcess(
executor = project.executor::execute, executor = {project.executor.execute(it)},
executable = executable, executable = executable,
args = arguments args = arguments
).run { ).run {
@@ -245,9 +245,9 @@ open class KonanLocalTest : KonanTest() {
for (i in 1..times) { for (i in 1..times) {
val args = arguments + (multiArguments?.get(i - 1) ?: emptyList()) val args = arguments + (multiArguments?.get(i - 1) ?: emptyList())
output += if (testData != null) output += if (testData != null)
runProcessWithInput(project.executor::execute, executable, args, testData!!) runProcessWithInput({project.executor.execute(it)}, executable, args, testData!!)
else else
runProcess(project.executor::execute, executable, args) runProcess({project.executor.execute(it)}, executable, args)
} }
if (compilerMessages) { if (compilerMessages) {
// TODO: as for now it captures output only in the driver task. // TODO: as for now it captures output only in the driver task.
@@ -84,7 +84,7 @@ fun Project.getFilesToCompile(compile: List<String>, exclude: List<String>): Lis
project.file(f) project.file(f)
.walk() .walk()
.filter { it.isFile && it.name.endsWith(".kt") && !excludeFiles.contains(it.absolutePath) } .filter { it.isFile && it.name.endsWith(".kt") && !excludeFiles.contains(it.absolutePath) }
.map(File::getAbsolutePath) .map{ it.absolutePath }
.asIterable() .asIterable()
} }
} }