Improve bash generation

dodona-edu · Sep 21, 2023 · ad15f91 · ad15f91
1 parent bffa69f
commit ad15f91
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/tested/languages/bash/generators.py b/tested/languages/bash/generators.py
@@ -210,19 +210,21 @@ def convert_execution_unit(pu: PreparedExecutionUnit) -> str:
             # Prepare command arguments if needed.
             if tc.testcase.is_main_testcase():
                 assert isinstance(tc.input, MainInput)
-                result += f"{indent}source {pu.submission_name}.sh "
+                result += f"{indent}bash {pu.submission_name}.sh "
                 result += " ".join(shlex.quote(s) for s in tc.input.arguments) + "\n"
             else:
                 assert isinstance(tc.input, PreparedTestcaseStatement)
                 result += indent + convert_statement(tc.input.input_statement()) + "\n"
             result += "\n"
 
         result += indent + ctx.after + "\n"
+        result += indent + "return $?" + "\n"
         result += "}\n"
 
     for i, ctx in enumerate(pu.contexts):
         result += "write_context_separator\n"
-        result += f"context_{i}\n"
+        result += f"context_{i} || (exit $?)\n"
+        result += f""
 
     result += "exit $?\n"