Skip to content

Commit 7118a30

Browse files
LipenSaloed
andauthored
Bump jacodb and fix JcSettings import (#242)
* Bump jacodb and fix JcSettings import * Disable flaky tests --------- Co-authored-by: Valentyn Sobol <napster_1997@mail.ru>
1 parent 5ecce14 commit 7118a30

File tree

5 files changed

+6
-2
lines changed

5 files changed

+6
-2
lines changed

buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ object Versions {
66
const val clikt = "5.0.0"
77
const val detekt = "1.23.7"
88
const val ini4j = "0.5.4"
9-
const val jacodb = "8a588e71e7"
9+
const val jacodb = "deeaae6dbf"
1010
const val juliet = "1.3.2"
1111
const val junit = "5.9.3"
1212
const val kotlin = "2.1.0"

usvm-jvm-dataflow/src/test/kotlin/org/usvm/dataflow/jvm/impl/BaseAnalysisTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import org.jacodb.api.jvm.JcMethod
2424
import org.jacodb.api.jvm.cfg.JcInst
2525
import org.jacodb.api.jvm.ext.findClass
2626
import org.jacodb.api.jvm.ext.methods
27+
import org.jacodb.impl.JcRamErsSettings
2728
import org.jacodb.impl.features.Builders
2829
import org.jacodb.impl.features.InMemoryHierarchy
2930
import org.jacodb.impl.features.Usages
@@ -57,6 +58,7 @@ abstract class BaseAnalysisTest(
5758

5859
val db: JcDatabase = runBlocking {
5960
jacodb {
61+
persistenceImpl(JcRamErsSettings)
6062
loadByteCode(allClasspath)
6163
useProcessJavaRuntime()
6264
keepLocalVariableNames()

usvm-jvm/src/test/kotlin/org/usvm/samples/JacoDBContainer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package org.usvm.samples
33
import kotlinx.coroutines.runBlocking
44
import org.jacodb.api.jvm.JcClasspath
55
import org.jacodb.api.jvm.JcDatabase
6+
import org.jacodb.api.jvm.JcSettings
67
import org.jacodb.approximation.Approximations
7-
import org.jacodb.impl.JcSettings
88
import org.jacodb.impl.features.InMemoryHierarchy
99
import org.jacodb.impl.jacodb
1010
import org.usvm.machine.interpreter.transformers.JcMultiDimArrayAllocationTransformer

usvm-jvm/src/test/kotlin/org/usvm/samples/arrays/ArrayStoreExceptionExamplesTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class ArrayStoreExceptionExamplesTest : ApproximationsTestRunner() {
2929
}
3030

3131
@Test
32+
@Disabled("TODO: randomly fails on CI") // todo: investigate, why engine miss some instructions on CI
3233
fun testCorrectAssignmentSubtype() {
3334
checkDiscoveredPropertiesWithExceptions(
3435
ArrayStoreExceptionExamples::correctAssignmentSubtype,

usvm-jvm/src/test/kotlin/org/usvm/samples/casts/ArrayCastExampleTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ internal class ArrayCastExampleTest : JavaMethodTestRunner() {
137137
}
138138

139139
@Test
140+
@Disabled("TODO: randomly fail due to type selection issues") // todo: use instantiatable types in test resolver
140141
fun testCastFromIterable() {
141142
checkDiscoveredProperties(
142143
ArrayCastExample::castFromIterable,

0 commit comments

Comments
 (0)