Revert "Fix org.jetbrains.kotlin.jps.build.KotlinJpsBuildTest#testSourcePackageLongPrefix"
This reverts commit e3634c16
This commit is contained in:
committed by
Space
parent
44d796e850
commit
9971ae4ffd
+4
-9
@@ -55,20 +55,15 @@ class RelocatableJpsCachesTest : BaseKotlinJpsBuildTestCase() {
|
||||
assertEqualDirectories(test1KotlinCachesDir, test2KotlinCachesDir, forgiveExtraFiles = false)
|
||||
}
|
||||
|
||||
private class RelocatableCacheTestCaseIml(
|
||||
private val testName: String,
|
||||
projectWorkingDir: File,
|
||||
dirToCopyKotlinCaches: File
|
||||
) : RelocatableCacheTestCase(projectWorkingDir, dirToCopyKotlinCaches) {
|
||||
override fun getName() = testName
|
||||
}
|
||||
|
||||
private fun runTestAndCopyKotlinCaches(
|
||||
projectWorkingDir: File,
|
||||
dirToCopyKotlinCaches: File,
|
||||
testMethod: KFunction1<RelocatableCacheTestCase, Unit>
|
||||
) {
|
||||
val testCase = RelocatableCacheTestCaseIml(testMethod.name, projectWorkingDir, dirToCopyKotlinCaches)
|
||||
val testCase = object : RelocatableCacheTestCase(projectWorkingDir, dirToCopyKotlinCaches) {
|
||||
override fun getName() = testMethod.name
|
||||
}
|
||||
|
||||
testCase.exposedPrivateApi.setUp()
|
||||
|
||||
try {
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
<component name="VcsDirectoryMappings">
|
||||
|
||||
Reference in New Issue
Block a user