Description:
autonew skips submissions with bad problems, forbids getch, better compiler msg when preprocessing fails, reports compile error when the executable is too large (100MB)
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
unknown
-
r132:ca6ce454fda9 - - 2 files changed: 24 inserted, 10 deleted
| @@ -246,12 +246,15 | |||||
|
|
246 | end |
|
246 | end |
|
|
247 |
|
247 | ||
|
|
248 | graded_any = false |
|
248 | graded_any = false |
|
|
249 |
|
249 | ||
|
|
250 | if submissions.length != 0 |
|
250 | if submissions.length != 0 |
|
|
251 | submissions.each do |submission| |
|
251 | submissions.each do |submission| |
|
|
|
252 | + if (submission.problem == nil) or (!submission.problem.available) | ||
|
|
|
253 | + next | ||
|
|
|
254 | + end | ||
|
|
252 | if ! graded_submission_ids[submission.id] |
|
255 | if ! graded_submission_ids[submission.id] |
|
|
253 | runner.grade_submission(submission) |
|
256 | runner.grade_submission(submission) |
|
|
254 | graded_submission_ids[submission.id] = true |
|
257 | graded_submission_ids[submission.id] = true |
|
|
255 | if (!latest_submitted_at or |
|
258 | if (!latest_submitted_at or |
|
|
256 | latest_submitted_at < submission.submitted_at) |
|
259 | latest_submitted_at < submission.submitted_at) |
|
|
257 | latest_submitted_at = submission.submitted_at |
|
260 | latest_submitted_at = submission.submitted_at |
| @@ -79,13 +79,13 | |||||
|
|
79 | end |
|
79 | end |
|
|
80 |
|
80 | ||
|
|
81 | if params[:prog_lang]=='cpp': |
|
81 | if params[:prog_lang]=='cpp': |
|
|
82 | params[:prog_lang] = 'c++' |
|
82 | params[:prog_lang] = 'c++' |
|
|
83 | end |
|
83 | end |
|
|
84 |
|
84 | ||
|
|
85 | - forbidden_functions = ['system', 'fopen', 'freopen', 'open', 'remove', 'rename'] |
|
85 | + forbidden_functions = ['system', 'fopen', 'freopen', 'open', 'remove', 'rename', 'getch'] |
|
|
86 | redefine_list = [] |
|
86 | redefine_list = [] |
|
|
87 | forbidden_count = 0 |
|
87 | forbidden_count = 0 |
|
|
88 | forbidden_key = (rand(8999) + 1000).to_s |
|
88 | forbidden_key = (rand(8999) + 1000).to_s |
|
|
89 | forbidden_functions.each do |f| |
|
89 | forbidden_functions.each do |f| |
|
|
90 | redefine_list << "-D#{f}=forbidden#{forbidden_key}#{forbidden_count}" |
|
90 | redefine_list << "-D#{f}=forbidden#{forbidden_key}#{forbidden_count}" |
|
|
91 | forbidden_count += 1 |
|
91 | forbidden_count += 1 |
| @@ -94,24 +94,27 | |||||
|
|
94 | puts redefine_str |
|
94 | puts redefine_str |
|
|
95 |
|
95 | ||
|
|
96 | # Compile. |
|
96 | # Compile. |
|
|
97 | case params[:prog_lang] |
|
97 | case params[:prog_lang] |
|
|
98 |
|
98 | ||
|
|
99 | when "c" |
|
99 | when "c" |
|
|
100 | - command = "#{C_COMPILER} -E #{params[:source_file]} -o source_prep.c" |
|
100 | + command = "#{C_COMPILER} -E #{params[:source_file]} -o source_prep.c 2> #{params[:message_file]}" |
|
|
101 | system(command) |
|
101 | system(command) |
|
|
102 | - command = "#{C_COMPILER} source_prep.c #{redefine_str} -o #{params[:output_file]} #{C_OPTIONS} 2> #{params[:message_file]}" |
|
102 | + if FileTest.exist? "source_prep.c" |
|
|
103 | - puts command |
|
103 | + command = "#{C_COMPILER} source_prep.c #{redefine_str} -o #{params[:output_file]} #{C_OPTIONS} 2> #{params[:message_file]}" |
|
|
104 | - system(command) |
|
104 | + system(command) |
|
|
|
105 | + end | ||
|
|
105 |
|
106 | ||
|
|
106 | when "c++" |
|
107 | when "c++" |
|
|
107 | - command = "#{CPLUSPLUS_COMPILER} -E #{params[:source_file]} -o source_prep.cpp" |
|
108 | + command = "#{CPLUSPLUS_COMPILER} -E #{params[:source_file]} -o source_prep.cpp 2> #{params[:message_file]}" |
|
|
108 | system(command) |
|
109 | system(command) |
|
|
109 | - command = "#{CPLUSPLUS_COMPILER} #{redefine_str} source_prep.cpp -o #{params[:output_file]} #{CPLUSPLUS_OPTIONS} 2> #{params[:message_file]}" |
|
110 | + if FileTest.exist? "source_prep.cpp" |
|
|
110 | - system(command) |
|
111 | + command = "#{CPLUSPLUS_COMPILER} #{redefine_str} source_prep.cpp -o #{params[:output_file]} #{CPLUSPLUS_OPTIONS} 2> #{params[:message_file]}" |
|
|
111 | - |
|
112 | + system(command) |
|
|
|
113 | + end | ||
|
|
|
114 | + | ||
|
|
112 | when "pas" |
|
115 | when "pas" |
|
|
113 | command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS} > #{params[:message_file]}" |
|
116 | command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS} > #{params[:message_file]}" |
|
|
114 | system(command) |
|
117 | system(command) |
|
|
115 | FileUtils.mv("output", params[:output_file]) |
|
118 | FileUtils.mv("output", params[:output_file]) |
|
|
116 |
|
119 | ||
|
|
117 | else |
|
120 | else |
| @@ -121,10 +124,18 | |||||
|
|
121 | end |
|
124 | end |
|
|
122 | exit(127) |
|
125 | exit(127) |
|
|
123 | end |
|
126 | end |
|
|
124 |
|
127 | ||
|
|
125 | # Report success or failure. |
|
128 | # Report success or failure. |
|
|
126 | if FileTest.exists? params[:output_file] |
|
129 | if FileTest.exists? params[:output_file] |
|
|
127 |
- talk "Compilation was successful!" |
|
130 | + talk "Compilation was successful!" |
|
|
|
131 | + | ||
|
|
|
132 | + if File.size(params[:output_file]) > 100000000 | ||
|
|
|
133 | + talk "But the executable is too big." | ||
|
|
|
134 | + open(params[:message_file],"w+") do |f| | ||
|
|
|
135 | + f.puts "Executable is too large." | ||
|
|
|
136 | + end | ||
|
|
|
137 | + File.delete(params[:output_file]) | ||
|
|
|
138 | + end | ||
|
|
128 | else |
|
139 | else |
|
|
129 | talk "ERROR: Something was wrong during the compilation!" |
|
140 | talk "ERROR: Something was wrong during the compilation!" |
|
|
130 | end |
|
141 | end |
You need to be logged in to leave comments.
Login now