no instrumentation mode added

UnitTestBot · Oct 9, 2023 · 555da94 · 555da94
1 parent 5f70d96
commit 555da94
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/...ntation/src/main/kotlin/org/usvm/instrumentation/executor/InstrumentationProcessRunner.kt b/...ntation/src/main/kotlin/org/usvm/instrumentation/executor/InstrumentationProcessRunner.kt
@@ -75,7 +75,7 @@ class InstrumentationProcessRunner(
 
     suspend fun executeUTestAsync(uTest: UTest): UTestExecutionResult = rdProcessRunner.callUTestAsync(uTest)
 
-    suspend fun destroy() = rdProcessRunner.destroy()
+    fun destroy() = rdProcessRunner.destroy()
 
 
 }
diff --git a/...nstrumentation/src/main/kotlin/org/usvm/instrumentation/executor/UTestConcreteExecutor.kt b/...nstrumentation/src/main/kotlin/org/usvm/instrumentation/executor/UTestConcreteExecutor.kt
@@ -61,6 +61,7 @@ class UTestConcreteExecutor(
         return try {
             instrumentationProcessRunner.executeUTestSync(uTest, timeout)
         } catch (e: TimeoutException) {
+            instrumentationProcessRunner.destroy()
             val descriptor = UTestExceptionDescriptor(
                 type = jcClasspath.findClass<Exception>().toType(),
                 message = e.message ?: "timeout",
@@ -69,6 +70,7 @@ class UTestConcreteExecutor(
             )
             UTestExecutionTimedOutResult(descriptor)
         } catch (e: RdFault) {
+            instrumentationProcessRunner.destroy()
             val descriptor = UTestExceptionDescriptor(
                 type = jcClasspath.findClass<Exception>().toType(),
                 message = e.reasonAsText,

diff --git a/...ntation/src/main/kotlin/org/usvm/instrumentation/instrumentation/JcInstrumenterFactory.kt b/...ntation/src/main/kotlin/org/usvm/instrumentation/instrumentation/JcInstrumenterFactory.kt
@@ -8,4 +8,7 @@ interface JcInstrumenterFactory<T: JcInstrumenter> {
 
 class JcRuntimeTraceInstrumenterFactory : JcInstrumenterFactory<JcRuntimeTraceInstrumenter> {
     override fun create(jcClasspath: JcClasspath): JcRuntimeTraceInstrumenter = JcRuntimeTraceInstrumenter(jcClasspath)
+}
+class NoInstrumentationFactory : JcInstrumenterFactory<NoInstrumentation> {
+    override fun create(jcClasspath: JcClasspath): NoInstrumentation = NoInstrumentation(jcClasspath)
 }
diff --git a/...rumentation/src/main/kotlin/org/usvm/instrumentation/instrumentation/NoInstrumentation.kt b/...rumentation/src/main/kotlin/org/usvm/instrumentation/instrumentation/NoInstrumentation.kt
@@ -0,0 +1,12 @@
+package org.usvm.instrumentation.instrumentation
+
+import org.jacodb.api.JcClasspath
+import org.objectweb.asm.tree.ClassNode
+
+class NoInstrumentation(
+    override val jcClasspath: JcClasspath
+) : JcInstrumenter {
+    override fun instrumentClass(classNode: ClassNode): ClassNode {
+        return classNode
+    }
+}