diff --git a/.github/actions/benchexec-test/theta.xml b/.github/actions/benchexec-test/theta.xml index 34b2710eda..67627c34ef 100644 --- a/.github/actions/benchexec-test/theta.xml +++ b/.github/actions/benchexec-test/theta.xml @@ -9,7 +9,7 @@ - + diff --git a/subprojects/solver/solver-smtlib/src/main/java/hu/bme/mit/theta/solver/smtlib/solver/installer/SmtLibSolverInstaller.java b/subprojects/solver/solver-smtlib/src/main/java/hu/bme/mit/theta/solver/smtlib/solver/installer/SmtLibSolverInstaller.java index d1fc3bc0e2..222508e06b 100644 --- a/subprojects/solver/solver-smtlib/src/main/java/hu/bme/mit/theta/solver/smtlib/solver/installer/SmtLibSolverInstaller.java +++ b/subprojects/solver/solver-smtlib/src/main/java/hu/bme/mit/theta/solver/smtlib/solver/installer/SmtLibSolverInstaller.java @@ -191,7 +191,8 @@ public final SolverFactory getSolverFactory(final Path home, final String versio final var installDir = home.resolve(version); if (!Files.exists(installDir)) { - throw new SmtLibSolverInstallerException("The version is not installed"); + throw new SmtLibSolverInstallerException("The version <" + version + + "> is not installed in <" + home + ">"); } try { diff --git a/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/params/XcfaConfig.kt b/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/params/XcfaConfig.kt index 0be7d6adad..802d547192 100644 --- a/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/params/XcfaConfig.kt +++ b/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/params/XcfaConfig.kt @@ -83,7 +83,13 @@ data class InputConfig( @Parameter(names = ["--property-value"], description = "Property") var property: ErrorDetection = ErrorDetection.ERROR_LOCATION -) : Config +) : Config { + + override fun toString(): String { + return "InputConfig(inputFile=${input}, catFile=${catFile}, parseCtx=${parseCtx}, " + + "xcfaWCtx=${xcfaWCtx?.let { "present" } ?: "missing"}, propertyFile=${propertyFile}, property=${property}" + } +} interface SpecFrontendConfig : Config data class FrontendConfig( diff --git a/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/utils/SolverRegistration.kt b/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/utils/SolverRegistration.kt index 00fca2a6d2..ff7c9ca2f4 100644 --- a/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/utils/SolverRegistration.kt +++ b/subprojects/xcfa/xcfa-cli/src/main/java/hu/bme/mit/theta/xcfa/cli/utils/SolverRegistration.kt @@ -35,9 +35,11 @@ fun registerAllSolverManagers(home: String, logger: Logger) { SolverManager.closeAll() // register solver managers SolverManager.registerSolverManager(Z3SolverManager.create()) + logger.write(Logger.Level.INFO, "Registered Z3 SolverManager") if (OsHelper.getOs() == OsHelper.OperatingSystem.LINUX) { val homePath = Path.of(home) val smtLibSolverManager: SmtLibSolverManager = SmtLibSolverManager.create(homePath, logger) SolverManager.registerSolverManager(smtLibSolverManager) + logger.write(Logger.Level.INFO, "Registered SMT-LIB SolverManager") } } \ No newline at end of file