From d32f485e17c5fc83339c04ce39b21df6bb4f89b1 Mon Sep 17 00:00:00 2001 From: l-kent Date: Mon, 19 Aug 2024 16:26:44 +1000 Subject: [PATCH] fix merge --- src/test/scala/SystemTests.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/scala/SystemTests.scala b/src/test/scala/SystemTests.scala index e2e540507..80a0ce4fc 100644 --- a/src/test/scala/SystemTests.scala +++ b/src/test/scala/SystemTests.scala @@ -144,7 +144,7 @@ trait SystemTests extends AnyFunSuite { Logger.info(outPath) val timer = PerformanceTimer(s"test $name/$variation") - val args = mutable.ArrayBuffer("--input", inputPath, "--relf", RELFPath, "--output", outPath) ++ conf.basilFlags + val args = mutable.ArrayBuffer("--input", inputPath, "--relf", RELFPath, "--output", outPath) ++ conf.BASILFlags if (File(specPath).exists) args ++= Seq("--spec", specPath) Main.main(args.toArray) @@ -185,7 +185,7 @@ trait SystemTests extends AnyFunSuite { } val passed = !timedOut && (verified == shouldVerify) && xor(verified, proveFailed) val result = TestResult(passed, verified, shouldVerify, hasExpected, timedOut, matchesExpected, translateTime, verifyTime) - val testSuffix = if useADT then ":BAP" else ":GTIRB" + val testSuffix = if conf.useBAPFrontend then ":BAP" else ":GTIRB" testResults.append((s"$name/$variation$testSuffix", result)) if (!passed) fail(failureMsg) } @@ -262,7 +262,7 @@ class ProcedureSummaryTests extends SystemTests { runTests(procedureSummaryPrograms, procedureSummaryPath, "analysis/procedure-summaries", TestConfig(BASILFlags = Seq("--analyse", "--summarise-procedures"), useBAPFrontend = false, expectVerify = true)) test("summary-procedureSummary") { - summary("proceduresummary-testresult") + summary("procedureSummary-testResult") } }