From 30e5e5a08e965365c2ec2426e158a4086692bafe Mon Sep 17 00:00:00 2001 From: "Dmitriy.Panov" Date: Wed, 10 Jun 2020 17:25:06 +0300 Subject: [PATCH] icons sync: exit process in case of non-daemon threads spawned from tests GitOrigin-RevId: ef0823367af60d393c6ca1382b8b18504c5b93f9 --- .../build/images/sync/ideaSyncFromIconsRepo.kt | 14 ++++++-------- .../org/jetbrains/intellij/build/images/util.kt | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/ideaSyncFromIconsRepo.kt b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/ideaSyncFromIconsRepo.kt index 5f9362ceba08..8e6d4732dfa6 100644 --- a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/ideaSyncFromIconsRepo.kt +++ b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/sync/ideaSyncFromIconsRepo.kt @@ -9,7 +9,7 @@ import org.jetbrains.jps.util.JpsPathUtil import java.io.File import kotlin.system.exitProcess -fun main(args: Array) { +fun main(args: Array) = try { if (args.isEmpty()) System.err.println("If you haven't intended to start full icons sync" + " then please specify required icons repo's commit hashes" + " joined by comma, semicolon or space in arguments") @@ -27,13 +27,11 @@ fun main(args: Array) { "intellij.platform.images.build" to listOf("org.jetbrains.intellij.build.images.CommunityIconClassesTest", "org.jetbrains.intellij.build.images.CommunityImageResourcesSanityTest") ) - try { - runTests(tests = tests.values.flatten(), modules = tests.keys) - } - finally { - // in case of non-daemon threads spawned from tests - exitProcess(0) - } + runTests(tests = tests.values.flatten(), modules = tests.keys) +} +finally { + // in case of non-daemon threads spawned from tests + exitProcess(0) } private fun echo(msg: String) = println("\n** $msg") diff --git a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/util.kt b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/util.kt index 8040828d6d75..6c804872da75 100644 --- a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/util.kt +++ b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/util.kt @@ -59,7 +59,7 @@ internal fun loadImage(file: Path): Image? { } } catch (e: Exception) { - e.printStackTrace() + e.printStackTrace(System.out) return null } }