SystemTests: insert suite name into output file names

this should avoid clashes where test suites try to write
to the same output file.

SystemTestsBAP and SystemTestsGTIRB are overriden to have
no suffix, to maintain compatibility with the update-expected
sbt/mill jobs.

Author: katrinafyi

src/test/scala/SystemTests.scala

@@ -18,6 +18,12 @@ import test_util.TestCustomisation
   */
 
 trait SystemTests extends AnyFunSuite, BASILTest, Retries, TestCustomisation {
+
+  /**
+   * A suffix appended to output file names, in order to avoid clashes between test suites.
+   */
+  def testSuiteSuffix = "_" + this.getClass.getSimpleName
+
   case class TestResult(
     name: String,
     passed: Boolean,
@@ -154,15 +160,23 @@ trait SystemTests extends AnyFunSuite, BASILTest, Retries, TestCustomisation {
   def runTest(path: String, name: String, variation: String, conf: TestConfig): Unit = {
     val directoryPath = path + "/" + name + "/"
     val variationPath = directoryPath + variation + "/" + name
-    val inputPath = if conf.useBAPFrontend then variationPath + ".adt" else variationPath + ".gts"
-    val BPLPath = if conf.useBAPFrontend then variationPath + "_bap.bpl" else variationPath + "_gtirb.bpl"
+    val suiteSuffix = testSuiteSuffix
+
+    // input files:
+    val inputPath = variationPath + (if conf.useBAPFrontend then ".adt" else ".gts")
     val specPath = directoryPath + name + ".spec"
     val RELFPath = variationPath + ".relf"
-    val resultPath =
-      if conf.useBAPFrontend then variationPath + "_bap_result.txt" else variationPath + "_gtirb_result.txt"
-    val testSuffix = if conf.useBAPFrontend then ":BAP" else ":GTIRB"
+
+    // output files:
+    val lifterString = if conf.useBAPFrontend then s"_bap" else s"_gtirb"
+    val BPLPath = variationPath + lifterString + suiteSuffix + ".bpl"
+    val resultPath = variationPath + lifterString + suiteSuffix + "_result.txt"
+
+    // reference file:
     val expectedOutPath = if conf.useBAPFrontend then variationPath + ".expected" else variationPath + "_gtirb.expected"
 
+    val testSuffix = if conf.useBAPFrontend then ":BAP" else ":GTIRB"
+
     Logger.info(s"$name/$variation$testSuffix")
     val timer = PerformanceTimer(s"test $name/$variation$testSuffix")
     runBASIL(inputPath, RELFPath, Some(specPath), BPLPath, conf.staticAnalysisConfig, conf.simplify)
@@ -250,6 +264,7 @@ trait SystemTests extends AnyFunSuite, BASILTest, Retries, TestCustomisation {
 
 @test_util.tags.StandardSystemTest
 class SystemTestsBAP extends SystemTests {
+  override def testSuiteSuffix = ""
   runTests("correct", TestConfig(useBAPFrontend = true, expectVerify = true, checkExpected = true, logResults = true))
   runTests(
     "incorrect",
@@ -262,6 +277,7 @@ class SystemTestsBAP extends SystemTests {
 
 @test_util.tags.StandardSystemTest
 class SystemTestsGTIRB extends SystemTests {
+  override def testSuiteSuffix = ""
   runTests("correct", TestConfig(useBAPFrontend = false, expectVerify = true, checkExpected = true, logResults = true))
   runTests(
     "incorrect",