rebase to main, solving conflicts

bmw-software-engineering · Nov 8, 2024 · 72b9582 · 72b9582
1 parent 23eb0f6
commit 72b9582
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -128,10 +128,10 @@ requirements.lobster: lobster/tools/trlc/requirements.trlc \
 code.lobster: $(wildcard lobster/tools/trlc/*.py)
 	lobster-python --out code.lobster lobster/tools/trlc
 
-unit-tests.lobster: $(wildcard test-unit/lobster-trlc/*.py)
-	lobster-python --activity --out unit-tests.lobster test-unit/lobster-trlc
+unit-tests.lobster: $(wildcard tests-unit/lobster-trlc/*.py)
+	lobster-python --activity --out unit-tests.lobster tests-unit/lobster-trlc
 
-system-tests.lobster: $(wildcard test-system/*/*.rsl) \
-                      $(wildcard test-system/*/*.trlc) \
-                      $(wildcard test-system/*/tracing)
-	python3 test-system/lobster-trlc/lobster-trlc-system-test.py
+system-tests.lobster: $(wildcard tests-system/*/*.rsl) \
+                      $(wildcard tests-system/*/*.trlc) \
+                      $(wildcard tests-system/*/tracing)
+	python3 tests-system/lobster-trlc/lobster-trlc-system-test.py
diff --git a/lobster/report.py b/lobster/report.py
@@ -118,6 +118,7 @@ def write_report(self, filename):
 
         with open(filename, "w", encoding="UTF-8") as fd:
             json.dump(report, fd, indent=2)
+            fd.write("\n")
 
     def load_report(self, filename):
         assert isinstance(filename, str)

diff --git a/tests-integration/projects/filter/report.reference_output b/tests-integration/projects/filter/report.reference_output
@@ -435,4 +435,4 @@
     }
   },
   "matrix": []
-}
+}
diff --git a/.../lobster-trlc/lobster-trlc-system-test.py → .../lobster-trlc/lobster-trlc-system-test.py b/.../lobster-trlc/lobster-trlc-system-test.py → .../lobster-trlc/lobster-trlc-system-test.py
diff --git a/...tem/lobster-trlc/rbt-output-file/.gitkeep → ...tem/lobster-trlc/rbt-output-file/.gitkeep b/...tem/lobster-trlc/rbt-output-file/.gitkeep → ...tem/lobster-trlc/rbt-output-file/.gitkeep
-Original file line number
+Diff line change
@@ Expand Up / @@ -435,4 +435,4 @@ @@
         }
       },
       "matrix": []
-    }
+    }