Merge fix-up

JetBrains-Research · Sep 4, 2024 · 9ee0105 · 9ee0105
1 parent 5695b4c
commit 9ee0105
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/core/src/nativeTest/kotlin/org/jetbrains/litmuskt/IntegrationTest.kt b/core/src/nativeTest/kotlin/org/jetbrains/litmuskt/IntegrationTest.kt
@@ -13,7 +13,6 @@ class IntegrationTest {
             var x = 0
         }
     }) {
-        // TODO: reset
         thread {
             x = 1
         }
@@ -27,13 +26,18 @@ class IntegrationTest {
             accept(1, 2)
             accept(0, 1) // r1 = 0; x = 2; x = 1 (t1); r2 = 1
         }
+        reset {
+            x = 0
+        }
     }
 
     @Test
     fun testBasic() {
         val runner = PthreadRunner()
+
+        @Suppress("UNCHECKED_CAST")
         val result = runner.runTests(
-            tests = listOf(sampleLitmusTest),
+            tests = listOf(sampleLitmusTest) as List<LitmusTest<Any>>,
             params = LitmusRunParams(
                 batchSize = 1_000_000,
                 syncPeriod = 10,

diff --git a/testsuite/src/commonMain/kotlin/org/jetbrains/litmuskt/tests/UnsafePublication.kt b/testsuite/src/commonMain/kotlin/org/jetbrains/litmuskt/tests/UnsafePublication.kt
@@ -94,6 +94,9 @@ object UnsafePublication {
             interesting(0)
             accept(-1)
         }
+        reset {
+            arr = null
+        }
     }
 
     val PlainIntArray = litmusTest({

diff --git a/testsuite/src/jvmMain/kotlin/org/jetbrains/litmuskt/UnsafePublicationJvm.kt b/testsuite/src/jvmMain/kotlin/org/jetbrains/litmuskt/UnsafePublicationJvm.kt
@@ -23,5 +23,8 @@ object UnsafePublicationJvm {
             forbid(0)
             accept(-1)
         }
+        reset {
+            arr = null
+        }
     }
 }
diff --git a/testsuite/src/nativeMain/kotlin/org/jetbrains/litmuskt/tests/UnsafePublicationNative.kt b/testsuite/src/nativeMain/kotlin/org/jetbrains/litmuskt/tests/UnsafePublicationNative.kt
@@ -27,5 +27,8 @@ object UnsafePublicationNative {
             interesting(0)
             accept(-1)
         }
+        reset {
+            arr = null
+        }
     }
 }