Skip to content

Usvm distribution for the contest #2704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EgorkaKulikov merged 4 commits into from
Nov 30, 2023
Merged

Usvm distribution for the contest #2704

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e2d1f5
utbot-usvm runtool distribution
Saloed Nov 29, 2023
9970a2b
Minor fixes
Saloed Nov 30, 2023
5e18ef4
Minor fixes
Saloed Nov 30, 2023
f1603ec
Mark as executable
Saloed Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Minor fixes
  • Loading branch information
@Saloed
Saloed committed Nov 30, 2023
commit 5e18ef4cb047063974a857c09ff259081ec4b4ff
74 changes: 38 additions & 36 deletions utbot-junit-contest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,48 +309,50 @@ task run(type: JavaExec) {
tasks.register("generateRuntool") {
dependsOn(jar, usvmInstrumentationRunnerJar)

def distDir = buildDir.toPath().resolve("utbot-usvm-runtool").toFile()
copy {
from jar.outputs
into distDir
rename { "utbot-usvm-tool.jar" }
}

copy {
from configurations.usvmApproximationsApi.resolvedConfiguration.files.find()
into distDir
rename { "usvm-api.jar" }
}
doLast {
def distDir = buildDir.toPath().resolve("utbot-usvm-runtool").toFile()
copy {
from jar.outputs
into distDir
rename { "utbot-usvm-tool.jar" }
}

copy {
from configurations.approximations.resolvedConfiguration.files.find()
into distDir
rename { "usvm-approximations.jar" }
}
copy {
from configurations.usvmApproximationsApi.resolvedConfiguration.files.find()
into distDir
rename { "usvm-api.jar" }
}

copy {
from configurations.usvmInstrumentationCollector.resolvedConfiguration.files.find()
into distDir
rename { "usvm-jvm-collectors.jar" }
}
copy {
from configurations.approximations.resolvedConfiguration.files.find()
into distDir
rename { "usvm-approximations.jar" }
}

copy {
from usvmInstrumentationRunnerJar.outputs
into distDir
rename { "usvm-jvm-instrumentation.jar" }
}
copy {
from configurations.usvmInstrumentationCollector.resolvedConfiguration.files.find()
into distDir
rename { "usvm-jvm-collectors.jar" }
}

copy {
from projectDir.toPath().resolve("usvm-runtool")
into distDir
rename { "runtool" }
}
copy {
from usvmInstrumentationRunnerJar.outputs
into distDir
rename { "usvm-jvm-instrumentation.jar" }
}

def libsDir = distDir.toPath().resolve("lib").toFile()
configurations.generatedTestCompile.resolvedConfiguration.files.forEach {f ->
copy {
from f
into libsDir
from projectDir.toPath().resolve("usvm-runtool")
into distDir
rename { "runtool" }
}

def libsDir = distDir.toPath().resolve("lib").toFile()
configurations.generatedTestCompile.resolvedConfiguration.files.forEach { f ->
copy {
from f
into libsDir
}
}
}
}
2 changes: 1 addition & 1 deletion utbot-junit-contest/src/main/kotlin/org/utbot/contest/usvm/ContestUsvm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ fun runUsvmGeneration(
timeout = generationTimeoutMillisWithoutCodegen.milliseconds - CONTEST_TEST_EXECUTION_TIMEOUT,
pathSelectionStrategies = listOf(PathSelectionStrategy.CLOSEST_TO_UNCOVERED_RANDOM),
pathSelectorFairnessStrategy = PathSelectorFairnessStrategy.COMPLETELY_FAIR,
solverType = SolverType.YICES,
solverType = SolverType.Z3, // TODO: usvm-ksmt: Yices doesn't work on old linux
)
) {
// TODO usvm-sbft: we may want to tune these JcSettings for contest
Expand Down