diff --git a/mjtest/environment.py b/mjtest/environment.py index 798e09fcc51ff11d3ba01bfb97af0a4010299663..2ee2a64c8c2c99546b147cd40fd361d37f252f92 100644 --- a/mjtest/environment.py +++ b/mjtest/environment.py @@ -112,8 +112,8 @@ class Environment: self._pid_tmpdirs = {} # type: Dict[int, str] self.only_small_exec_tests = not all_exec_tests - self.timeout = float(os.getenv("MJ_TIMEOUT", "5")) - self.big_timeout = float(os.getenv("MJ_BIG_TIMEOUT", "30")) + self.timeout = float(os.getenv("MJ_TIMEOUT", "10")) + self.big_timeout = float(os.getenv("MJ_BIG_TIMEOUT", "60")) def create_tmpfile(self) -> str: self._tmp_file_ctr += 1 diff --git a/mjtest/test/exec_tests.py b/mjtest/test/exec_tests.py index 91e9d252e83a031defc4790dfd5158f9e1f6950d..0b077f8469248494b03f192c6ad9b6b0cfb9210b 100644 --- a/mjtest/test/exec_tests.py +++ b/mjtest/test/exec_tests.py @@ -63,14 +63,14 @@ class JavaExecTest(BasicSyntaxTest): test_result.add_file("Source file", self.preprocessed_file) os.chdir(cwd) return test_result - main_class = get_main_class_name(base_filename + ".java", timeout=timeout) + main_class = get_main_class_name(base_filename + ".java") if not main_class: _LOG.debug("Can't find a main class, using the file name instead") main_class = base_filename exp_out, err, java_rtcode = \ self.env.run_command("java", get_main_class_name(base_filename + ".java"), timeout=timeout) - test_result.add_long_text("Java output: ", exp_out.decode()) if javac_rtcode != 0: + test_result.add_long_text("Java output: ", exp_out.decode()) test_result.incorrect_msg = "java runtime error" test_result.set_error_code(java_rtcode) test_result.add_long_text("Java error message", err.decode()) @@ -88,8 +88,7 @@ class JavaExecTest(BasicSyntaxTest): if self._has_expected_output_file and self.type == self.MODE and self.env.mode == self.MODE: with open(self._expected_output_file, "r") as f: exp_out = f.read() - test_result.add_short_text("Expected output file", self._expected_output_file) - test_result.add_long_text("Expected output", exp_out) + try: out, err, rtcode = None, None, None try: @@ -136,6 +135,9 @@ class JavaExecTest(BasicSyntaxTest): if exp_out.strip() != out.strip(): test_result.incorrect_msg = "incorrect output" test_result.has_succeeded = False + test_result.add_short_text("Expected output file", self._expected_output_file) + test_result.add_long_text("Expected output", exp_out) + test_result.add_long_text("Actual output", out) test_result.add_diff("Output diff [expected <-> actual]", exp_out, out, with_line_numbers=True) test_result.add_file("Source file", self.preprocessed_file) os.chdir(cwd)