diff options
author | maheshgudi | 2016-12-23 15:00:27 +0530 |
---|---|---|
committer | maheshgudi | 2016-12-23 15:00:27 +0530 |
commit | b582c624a7c49e3312e07196df87f26180a520c2 (patch) | |
tree | 909679721d2fa2b55a27e7621999dd04c9d36146 /yaksh/java_code_evaluator.py | |
parent | 5f6b103408ff8a520c741d2d21d1aff24a823dad (diff) | |
parent | 48366e84b98157ac32b22b2aa19b1c1cde68afd4 (diff) | |
download | online_test-b582c624a7c49e3312e07196df87f26180a520c2.tar.gz online_test-b582c624a7c49e3312e07196df87f26180a520c2.tar.bz2 online_test-b582c624a7c49e3312e07196df87f26180a520c2.zip |
fixed pull conflicts
Diffstat (limited to 'yaksh/java_code_evaluator.py')
-rw-r--r-- | yaksh/java_code_evaluator.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/yaksh/java_code_evaluator.py b/yaksh/java_code_evaluator.py index 5d3fd28..91e5840 100644 --- a/yaksh/java_code_evaluator.py +++ b/yaksh/java_code_evaluator.py @@ -18,6 +18,7 @@ class JavaCodeEvaluator(BaseEvaluator): self.files = [] self.compiled_user_answer = None self.compiled_test_code = None + self.submit_code_path = "" self.user_output_path = "" self.ref_output_path = "" @@ -142,7 +143,7 @@ class JavaCodeEvaluator(BaseEvaluator): stderr=subprocess.PIPE) proc, stdout, stderr = ret if proc.returncode == 0: - success, err = True, "Correct answer" + success, err = True, None mark_fraction = float(seelf.weight) if self.partial_grading else 0.0 else: err = stdout + "\n" + stderr |