Fix non-reported exit code

tested/manual.py

@@ -13,24 +13,22 @@
 from tested.main import run
 from tested.testsuite import ExecutionMode, SupportedLanguage
 
-exercise_dir = "/home/niko/Ontwikkeling/universal-judge/tests/exercises/echo-function"
+exercise_dir = "/home/niko/Ontwikkeling/CG-Dodona/reeks09/rebussen oplossen/"
 
 
 def read_config() -> DodonaConfig:
     """Read the configuration from stdout"""
     return DodonaConfig(
         memory_limit=536870912,
         time_limit=60,
-        programming_language=SupportedLanguage("haskell"),
+        programming_language=SupportedLanguage("bash"),
         natural_language="nl",
         resources=Path(exercise_dir, "evaluation"),
-        source=Path(exercise_dir, "solution/correct.hs"),
+        source=Path("test.sh"),
         judge=Path("."),
         workdir=Path("workdir"),
-        test_suite="one-language-literals.yaml",
+        test_suite="tests.yaml",
         options=Options(
-            allow_fallback=False,
-            mode=ExecutionMode.PRECOMPILATION,
             linter=False,
         ),
     )
@@ -57,13 +55,18 @@ def read_config() -> DodonaConfig:
     config.workdir.mkdir(exist_ok=True)
 
     # Delete content in work dir
-    # noinspection PyTypeChecker
     for root, dirs, files in os.walk(config.workdir):
         for f in files:
             os.unlink(os.path.join(root, f))
         for d in dirs:
             shutil.rmtree(os.path.join(root, d), ignore_errors=True)
 
+        # Copy existing files to workdir if needed.
+    if Path(exercise_dir, "workdir").is_dir():
+        shutil.copytree(
+            Path(exercise_dir, "workdir"), config.workdir, dirs_exist_ok=True
+        )
+
     start = time.time()
     run(config, sys.stdout)
     end = time.time()

tested/testsuite.py

@@ -399,7 +399,7 @@ def get_used_features(self) -> FeatureSet:
 FileOutput = FileOutputChannel | IgnoredChannel
 ExceptionOutput = ExceptionOutputChannel | SpecialOutputChannel
 ValueOutput = ValueOutputChannel | SpecialOutputChannel
-ExitOutput = ExitCodeOutputChannel | IgnoredChannel
+ExitOutput = ExitCodeOutputChannel | IgnoredChannel | EmptyChannel
 
 
 @define
@@ -411,7 +411,8 @@ class Output(WithFeatures):
     file: FileOutput = IgnoredChannel.IGNORED
     exception: ExceptionOutput = EmptyChannel.NONE
     result: ValueOutput = EmptyChannel.NONE
-    exit_code: ExitOutput = IgnoredChannel.IGNORED
+    # This default value is adjusted later, based on the position of the output.
+    exit_code: ExitOutput = EmptyChannel.NONE
 
     def get_used_features(self) -> FeatureSet:
         return combine_features(
@@ -583,6 +584,14 @@ class Context(WithFeatures, WithFunctions):
     after: Code = field(factory=dict)
     description: Optional[str] = None
 
+    def __attrs_post_init__(self):
+        # Fix the default value of the exit code outputs.
+        for non_last_testcase in self.testcases[:-1]:
+            if non_last_testcase.output.exit_code == EmptyChannel.NONE:
+                non_last_testcase.output.exit_code = IgnoredChannel.IGNORED
+        if (last_testcase := self.testcases[-1]).output.exit_code == EmptyChannel.NONE:
+            last_testcase.output.exit_code = ExitCodeOutputChannel()
+
     @testcases.validator  # type: ignore
     def check_testcases(self, _, value: List[Testcase]):
         # Check that only the first testcase has a main call.
@@ -592,7 +601,10 @@ def check_testcases(self, _, value: List[Testcase]):
 
         # Check that only the last testcase has an exit code check.
         for non_last_testcase in value[1:-1]:
-            if non_last_testcase.output.exit_code != IgnoredChannel.IGNORED:
+            if non_last_testcase.output.exit_code not in (
+                IgnoredChannel.IGNORED,
+                EmptyChannel.NONE,
+            ):
                 raise ValueError("Only the last testcase may have an exit code check.")
 
     def get_functions(self) -> Iterable[FunctionCall]: