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

Test: use one function to find test's build log for jps and gradle

Browse Source 
Original commit: c1a61b17c7
This commit is contained in:
Alexey Tsvetkov
2016-03-14 15:52:40 +03:00
parent 486b6cd2e0
commit 30f2dd0684
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+7 -11
View File
@@ -74,8 +74,6 @@ abstract class AbstractIncrementalJpsTest(
val TEMP_DIRECTORY_TO_USE = File(FileUtilRt.getTempDirectory())
val DEBUG_LOGGING_ENABLED = System.getProperty("debug.logging.enabled") == "true"
private val BUILD_LOG_FILE_NAME = "build.log"
}
protected open val enableExperimentalIncrementalCompilation = false
@@ -90,7 +88,8 @@ abstract class AbstractIncrementalJpsTest(
protected var mapWorkingToOriginalFile: MutableMap<File, File> = hashMapOf()
protected open val experimentalBuildLogFileName = "experimental-ic-build.log"
protected open val buildLogFinder: BuildLogFinder
get() = BuildLogFinder(isExperimentalEnabled = enableExperimentalIncrementalCompilation)
private fun enableDebugLogging() {
com.intellij.openapi.diagnostic.Logger.setFactory(TestLoggerFactory::class.java)
@@ -274,18 +273,15 @@ abstract class AbstractIncrementalJpsTest(
initialMake()
val otherMakeResults = performModificationsAndMake(moduleNames)
val buildLogFile = File(testDataDir, BUILD_LOG_FILE_NAME)
val experimentalBuildLog = File(testDataDir, experimentalBuildLogFileName)
val buildLogFile = buildLogFinder.findBuildLog(testDataDir)
val logs = createBuildLog(otherMakeResults)
if (enableExperimentalIncrementalCompilation && experimentalBuildLog.exists()) {
UsefulTestCase.assertSameLinesWithFile(experimentalBuildLog.absolutePath, logs)
}
else if (buildLogFile.exists() || !allowNoBuildLogFileInTestData) {
if (buildLogFile != null && buildLogFile.exists()) {
UsefulTestCase.assertSameLinesWithFile(buildLogFile.absolutePath, logs)
}
else if (!allowNoBuildLogFileInTestData) {
throw IllegalStateException("No build log file in $testDataDir")
}
if (!enableExperimentalIncrementalCompilation && File(testDataDir, "dont-check-caches-in-non-experimental-ic.txt").exists()) return
jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt
+3 -1
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.jps.build
import org.jetbrains.jps.incremental.ModuleBuildTarget
import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder
import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider
abstract class AbstractExperimentalIncrementalJpsTest : AbstractIncrementalJpsTest() {
@@ -40,7 +41,8 @@ abstract class AbstractExperimentalIncrementalCacheVersionChangedTest : Abstract
}
abstract class AbstractDataContainerVersionChangedTest : AbstractExperimentalIncrementalCacheVersionChangedTest() {
override val experimentalBuildLogFileName = "data-container-version-build.log"
override val buildLogFinder: BuildLogFinder
get() = BuildLogFinder(isExperimentalEnabled = true, isDataContainerBuildLogEnabled = true)
override fun getVersions(cacheVersionProvider: CacheVersionProvider, targets: Iterable<ModuleBuildTarget>) =
listOf(cacheVersionProvider.dataContainerVersion())