Skip to content

Commit 91803c2

Browse files
committed
Update usvm version and related updates in JcContainer
1 parent 4ad8c4a commit 91803c2

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ springBootVersion=2.7.13
109109
springSecurityVersion=5.8.5
110110

111111
approximationsVersion=bfce4eedde
112-
usvmVersion=72924ad
112+
usvmVersion=89797677a7
113113

114114
# configuration for build server
115115
#

utbot-usvm/src/main/kotlin/org/utbot/usvm/jc/JcContainer.kt

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ import org.jacodb.api.JcDatabase
77
import org.jacodb.impl.JcSettings
88
import org.jacodb.impl.features.classpaths.UnknownClasses
99
import org.jacodb.impl.jacodb
10+
import org.usvm.instrumentation.executor.InstrumentationProcessPaths
1011
import org.usvm.instrumentation.executor.UTestConcreteExecutor
1112
import org.usvm.instrumentation.instrumentation.JcRuntimeTraceInstrumenterFactory
13+
import org.usvm.util.ApproximationPaths
1214
import org.usvm.util.classpathWithApproximations
1315
import java.io.File
1416
import kotlin.time.Duration.Companion.seconds
@@ -51,8 +53,12 @@ class JcContainer private constructor(
5153
persistent(location = persistenceLocation, clearOnStart = false)
5254
}
5355
}
54-
// TODO ApproximationPaths(JcJars.approximationsJar, ...)
55-
val cp = db.classpathWithApproximations(classpath, listOf(UnknownClasses))
56+
57+
val approximationPaths = ApproximationPaths(
58+
usvmApiJarPath = JcJars.approximationsApiJar.absolutePath,
59+
usvmApproximationsJarPath = JcJars.approximationsJar.absolutePath,
60+
)
61+
val cp = db.classpathWithApproximations(classpath, listOf(UnknownClasses), approximationPaths)
5662
db to cp
5763
}
5864
this.db = db
@@ -61,8 +67,11 @@ class JcContainer private constructor(
6167
JcRuntimeTraceInstrumenterFactory::class,
6268
cpPath,
6369
cp,
64-
// TODO InstrumentedProcessPaths(JcJars.runnerJar, collectorsJar, javaHome.absolutePath)
65-
javaHome.absolutePath,
70+
InstrumentationProcessPaths(
71+
pathToUsvmInstrumentationJar = JcJars.runnerJar.absolutePath,
72+
pathToUsvmCollectorsJar = JcJars.collectorsJar.absolutePath,
73+
pathToJava = javaHome.absolutePath,
74+
),
6675
persistenceLocation,
6776
TEST_EXECUTION_TIMEOUT
6877
)

0 commit comments

Comments
 (0)