cafe-grader-judge-scripts

Commit r113:c3fb576034e2 public

parent | child
Description:
Merge branch 'master' of gitorious.org:cafe-grader/cafe-grader-judge-scripts into win-local
Commit status:
[Not Reviewed]
References:
merge default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r113:c3fb576034e2 - - 1 file changed: 4 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -149,25 +149,28
149 protected
149 protected
150 def read_result(test_result_dir)
150 def read_result(test_result_dir)
151 # TODO:
151 # TODO:
152 cmp_msg_fname = "#{test_result_dir}/compiler_message"
152 cmp_msg_fname = "#{test_result_dir}/compiler_message"
153 cmp_file = File.open(cmp_msg_fname)
153 cmp_file = File.open(cmp_msg_fname)
154 cmp_msg = cmp_file.read
154 cmp_msg = cmp_file.read
155 cmp_file.close
155 cmp_file.close
156
156
157 result_file_name = "#{test_result_dir}/1/result"
157 result_file_name = "#{test_result_dir}/1/result"
158
158
159 if File.exists?(result_file_name)
159 if File.exists?(result_file_name)
160 output_file_name = "#{test_result_dir}/1/output.txt"
160 output_file_name = "#{test_result_dir}/1/output.txt"
161 - results = File.open("#{test_result_dir}/1/result").readlines
161 + results = []
162 + File.open("#{test_result_dir}/1/result") do |f|
163 + results = f.readlines
164 + end
162 stat = extract_running_stat(results)
165 stat = extract_running_stat(results)
163
166
164 return {
167 return {
165 :output_file_name => output_file_name,
168 :output_file_name => output_file_name,
166 :running_stat => stat,
169 :running_stat => stat,
167 :comment => "",
170 :comment => "",
168 :cmp_msg => cmp_msg}
171 :cmp_msg => cmp_msg}
169 else
172 else
170 return {
173 return {
171 :running_stat => nil,
174 :running_stat => nil,
172 :comment => "Compilation error",
175 :comment => "Compilation error",
173 :cmp_msg => cmp_msg}
176 :cmp_msg => cmp_msg}
You need to be logged in to leave comments. Login now