Review fixes

Kotlin · Nov 18, 2020 · 83abfbe · 83abfbe
1 parent 1adfb4f
commit 83abfbe
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 !/.idea/copyright
 !/.idea/codeStyleSettings.xml
 !/.idea/codeStyles
+!/.idea/dictionaries
 *.iml
 .gradle
 .gradletasknamecache

diff --git a/.idea/dictionaries/ndkoval.xml b/.idea/dictionaries/ndkoval.xml
diff --git a/kotlinx-coroutines-core/build.gradle b/kotlinx-coroutines-core/build.gradle
@@ -188,6 +188,8 @@ jvmTest {
  // We should not set this security manager when `jvmTest`
  // is invoked by IntelliJ IDEA since we need to pass
  // system properties for Lincheck and stress tests.
+ // TODO this can be removed once IDEA is allowed to use `jvmLincheckTest` and
+ // TODO `jvmStressTest` tasks for the corresponding tests instead of using `jvmTest`.
  systemProperty 'java.security.manager', 'kotlinx.coroutines.TestSecurityManager'
  }
  // 'stress' is required to be able to run all subpackage tests like ":jvmTests --tests "*channels*" -Pstress=true"
@@ -197,6 +199,8 @@ jvmTest {
  }
  if (Idea.active) {
  // Configure the IDEA runner for Lincheck and stress tests
+ // TODO this can be removed once IDEA is allowed to use `jvmLincheckTest` and
+ // TODO `jvmStressTest` tasks for the corresponding tests instead of using `jvmTest`.
  jvmArgs = ['--add-opens', 'java.base/jdk.internal.misc=ALL-UNNAMED', // required for transformation
  '--add-exports', 'java.base/jdk.internal.util=ALL-UNNAMED'] // in the model checking mode
  maxHeapSize = '6g' // we need more memory for model checking

diff --git a/...t/linearizability/ChannelsLCStressTest.kt → ...jvm/test/lincheck/ChannelsLincheckTest.kt b/...t/linearizability/ChannelsLCStressTest.kt → ...jvm/test/lincheck/ChannelsLincheckTest.kt
@@ -3,7 +3,7 @@
  */
 @file:Suppress("unused")
 
-package kotlinx.coroutines.linearizability
+package kotlinx.coroutines.lincheck
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.*

diff --git a/...nearizability/LockFreeListLCStressTest.kt → ...test/lincheck/LockFreeListLincheckTest.kt b/...nearizability/LockFreeListLCStressTest.kt → ...test/lincheck/LockFreeListLincheckTest.kt
@@ -3,7 +3,7 @@
  */
 @file:Suppress("unused")
 
-package kotlinx.coroutines.linearizability
+package kotlinx.coroutines.lincheck
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.internal.*

diff --git a/...zability/LockFreeTaskQueueLCStressTest.kt → ...lincheck/LockFreeTaskQueueLincheckTest.kt b/...zability/LockFreeTaskQueueLCStressTest.kt → ...lincheck/LockFreeTaskQueueLincheckTest.kt
@@ -3,7 +3,7 @@
  */
 @file:Suppress("unused")
 
-package kotlinx.coroutines.linearizability
+package kotlinx.coroutines.lincheck
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.internal.*

diff --git a/...test/linearizability/MutexLCStressTest.kt → ...re/jvm/test/lincheck/MutexLincheckTest.kt b/...test/linearizability/MutexLCStressTest.kt → ...re/jvm/test/lincheck/MutexLincheckTest.kt
@@ -2,7 +2,7 @@
  * Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 @file:Suppress("unused")
-package kotlinx.coroutines.linearizability
+package kotlinx.coroutines.lincheck
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.sync.*

diff --git a/...zability/SegmentListRemoveLCStressTest.kt → ...lincheck/SegmentListRemoveLincheckTest.kt b/...zability/SegmentListRemoveLCStressTest.kt → ...lincheck/SegmentListRemoveLincheckTest.kt
@@ -4,7 +4,7 @@
 
 @file:Suppress("unused")
 
-package kotlinx.coroutines.linearizability
+package kotlinx.coroutines.lincheck
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.internal.*

diff --git a/...nearizability/SegmentQueueLCStressTest.kt → ...test/lincheck/SegmentQueueLincheckTest.kt b/...nearizability/SegmentQueueLCStressTest.kt → ...test/lincheck/SegmentQueueLincheckTest.kt
@@ -3,7 +3,7 @@
  */
 @file:Suppress("unused")
 
-package kotlinx.coroutines.linearizability
+package kotlinx.coroutines.lincheck
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.internal.SegmentBasedQueue

diff --git a/.../linearizability/SemaphoreLCStressTest.kt → ...vm/test/lincheck/SemaphoreLincheckTest.kt b/.../linearizability/SemaphoreLCStressTest.kt → ...vm/test/lincheck/SemaphoreLincheckTest.kt
@@ -2,7 +2,7 @@
  * Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 @file:Suppress("unused")
-package kotlinx.coroutines.linearizability
+package kotlinx.coroutines.lincheck
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.sync.*