Description:
add feature to import_problem to automatically copy *.txt file and fix the judge script accordingly
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r235:90afe1fa9431 - - 2 files changed: 12 inserted, 0 deleted
@@ -124,48 +124,54 | |||||
|
124 | create_dir_if_not_exists("#{problem_dir}/test_cases") |
|
124 | create_dir_if_not_exists("#{problem_dir}/test_cases") |
|
125 |
|
125 | ||
|
126 | puts "copying testcases" |
|
126 | puts "copying testcases" |
|
127 |
|
127 | ||
|
128 | tr_num = 0 |
|
128 | tr_num = 0 |
|
129 |
|
129 | ||
|
130 | num_testcases = 0 |
|
130 | num_testcases = 0 |
|
131 |
|
131 | ||
|
132 | testrun_info.each do |testrun| |
|
132 | testrun_info.each do |testrun| |
|
133 | tr_num += 1 |
|
133 | tr_num += 1 |
|
134 | puts "testrun: #{tr_num}" |
|
134 | puts "testrun: #{tr_num}" |
|
135 |
|
135 | ||
|
136 | testrun.each do |testcase_info| |
|
136 | testrun.each do |testcase_info| |
|
137 | testcase_num, testcase_fname = testcase_info |
|
137 | testcase_num, testcase_fname = testcase_info |
|
138 |
|
138 | ||
|
139 | puts "copy #{testcase_fname} to #{testcase_num}" |
|
139 | puts "copy #{testcase_fname} to #{testcase_num}" |
|
140 |
|
140 | ||
|
141 | create_dir_if_not_exists("#{problem_dir}/test_cases/#{testcase_num}") |
|
141 | create_dir_if_not_exists("#{problem_dir}/test_cases/#{testcase_num}") |
|
142 | copy_testcase("#{testcase_dir}",testcase_fname,"#{problem_dir}/test_cases/#{testcase_num}",testcase_num) |
|
142 | copy_testcase("#{testcase_dir}",testcase_fname,"#{problem_dir}/test_cases/#{testcase_num}",testcase_num) |
|
143 |
|
143 | ||
|
144 | num_testcases += 1 |
|
144 | num_testcases += 1 |
|
145 | end |
|
145 | end |
|
146 | end |
|
146 | end |
|
147 |
|
147 | ||
|
|
148 | + #also include any .txt files | ||
|
|
149 | + Dir.glob("#{testcase_dir}/*.txt") do |file| | ||
|
|
150 | + puts "copy data file #{file}" | ||
|
|
151 | + FileUtils.cp(file,"#{problem_dir}") | ||
|
|
152 | + end | ||
|
|
153 | + | ||
|
148 | # generating all_tests.cfg |
|
154 | # generating all_tests.cfg |
|
149 | puts "generating testcase config file" |
|
155 | puts "generating testcase config file" |
|
150 |
|
156 | ||
|
151 | template = File.open(SCRIPT_DIR + "/templates/all_tests.cfg.erb").read |
|
157 | template = File.open(SCRIPT_DIR + "/templates/all_tests.cfg.erb").read |
|
152 | all_test_cfg = ERB.new(template) |
|
158 | all_test_cfg = ERB.new(template) |
|
153 |
|
159 | ||
|
154 | cfg_file = File.open("#{problem_dir}/test_cases/all_tests.cfg","w") |
|
160 | cfg_file = File.open("#{problem_dir}/test_cases/all_tests.cfg","w") |
|
155 | cfg_file.puts all_test_cfg.result binding |
|
161 | cfg_file.puts all_test_cfg.result binding |
|
156 | cfg_file.close |
|
162 | cfg_file.close |
|
157 |
|
163 | ||
|
158 | # copy check script |
|
164 | # copy check script |
|
159 | if res = /^wrapper:(.*)$/.match(check_script) |
|
165 | if res = /^wrapper:(.*)$/.match(check_script) |
|
160 | # wrapper script |
|
166 | # wrapper script |
|
161 | check_script_fname = res[1] |
|
167 | check_script_fname = res[1] |
|
162 | script_name = File.basename(check_script_fname) |
|
168 | script_name = File.basename(check_script_fname) |
|
163 | check_wrapper_template = File.open(SCRIPT_DIR + "/templates/check_wrapper").read |
|
169 | check_wrapper_template = File.open(SCRIPT_DIR + "/templates/check_wrapper").read |
|
164 | check_wrapper = ERB.new(check_wrapper_template) |
|
170 | check_wrapper = ERB.new(check_wrapper_template) |
|
165 |
|
171 | ||
|
166 | check_file = File.open("#{problem_dir}/script/check","w") |
|
172 | check_file = File.open("#{problem_dir}/script/check","w") |
|
167 | check_file.puts check_wrapper.result binding |
|
173 | check_file.puts check_wrapper.result binding |
|
168 | check_file.close |
|
174 | check_file.close |
|
169 |
|
175 | ||
|
170 | File.chmod(0755,"#{problem_dir}/script/check") |
|
176 | File.chmod(0755,"#{problem_dir}/script/check") |
|
171 |
|
177 |
@@ -119,48 +119,54 | |||||
|
119 |
|
119 | ||
|
120 | require "#{problem_home}/script/test_dsl.rb" |
|
120 | require "#{problem_home}/script/test_dsl.rb" |
|
121 | load "#{problem_home}/test_cases/all_tests.cfg" |
|
121 | load "#{problem_home}/test_cases/all_tests.cfg" |
|
122 | problem = Problem.get_instance |
|
122 | problem = Problem.get_instance |
|
123 |
|
123 | ||
|
124 | if problem.well_formed? == false |
|
124 | if problem.well_formed? == false |
|
125 | log "The problem specification is not well formed." |
|
125 | log "The problem specification is not well formed." |
|
126 | exit(127) |
|
126 | exit(127) |
|
127 | end |
|
127 | end |
|
128 |
|
128 | ||
|
129 | # Doing the testing. |
|
129 | # Doing the testing. |
|
130 | (1..(problem.num_tests)).each do |test_num| |
|
130 | (1..(problem.num_tests)).each do |test_num| |
|
131 |
|
131 | ||
|
132 | $stdout.print "[#{test_num}]" |
|
132 | $stdout.print "[#{test_num}]" |
|
133 | $stdout.flush |
|
133 | $stdout.flush |
|
134 |
|
134 | ||
|
135 | log "Test number: #{test_num}" |
|
135 | log "Test number: #{test_num}" |
|
136 |
|
136 | ||
|
137 | call_and_log("Cannot copy the compiled program into #{sandbox_dir}") { |
|
137 | call_and_log("Cannot copy the compiled program into #{sandbox_dir}") { |
|
138 | FileUtils.cp("#{test_result_dir}/a.out", sandbox_dir, :preserve => true) |
|
138 | FileUtils.cp("#{test_result_dir}/a.out", sandbox_dir, :preserve => true) |
|
139 | if language == "java" then Dir["#{test_result_dir}/*.class"].each { |file| FileUtils.cp(file,sandbox_dir)} end |
|
139 | if language == "java" then Dir["#{test_result_dir}/*.class"].each { |file| FileUtils.cp(file,sandbox_dir)} end |
|
140 | if language == "python" then Dir["#{test_result_dir}/*.pyc"].each { |file| FileUtils.cp(file,sandbox_dir)} end |
|
140 | if language == "python" then Dir["#{test_result_dir}/*.pyc"].each { |file| FileUtils.cp(file,sandbox_dir)} end |
|
141 | } |
|
141 | } |
|
142 |
|
142 | ||
|
|
143 | + #additionally copy any extra .txt file | ||
|
|
144 | + data_files = Dir[problem_home + '/*.txt'] | ||
|
|
145 | + data_files.each do |file| | ||
|
|
146 | + FileUtils.cp(file,sandbox_dir) | ||
|
|
147 | + end | ||
|
|
148 | + | ||
|
143 | begin |
|
149 | begin |
|
144 | execute("#{problem_home}/script/run #{language} #{test_num} ", "Error occured during execution of the run script") |
|
150 | execute("#{problem_home}/script/run #{language} #{test_num} ", "Error occured during execution of the run script") |
|
145 | rescue |
|
151 | rescue |
|
146 | # do nothing |
|
152 | # do nothing |
|
147 | end |
|
153 | end |
|
148 |
|
154 | ||
|
149 | call_and_log("Cannot create directory #{test_result_dir}/#{test_num}") { |
|
155 | call_and_log("Cannot create directory #{test_result_dir}/#{test_num}") { |
|
150 | FileUtils.mkdir "#{test_result_dir}/#{test_num}" |
|
156 | FileUtils.mkdir "#{test_result_dir}/#{test_num}" |
|
151 | } |
|
157 | } |
|
152 | call_and_log("Cannot copy the result file into #{test_result_dir}/#{test_num}") { |
|
158 | call_and_log("Cannot copy the result file into #{test_result_dir}/#{test_num}") { |
|
153 | FileUtils.mv "#{sandbox_dir}/result", "#{test_result_dir}/#{test_num}" |
|
159 | FileUtils.mv "#{sandbox_dir}/result", "#{test_result_dir}/#{test_num}" |
|
154 | } |
|
160 | } |
|
155 | call_and_log("Cannot copy the comment file into #{test_result_dir}/#{test_num}") { |
|
161 | call_and_log("Cannot copy the comment file into #{test_result_dir}/#{test_num}") { |
|
156 | FileUtils.mv "#{sandbox_dir}/comment", "#{test_result_dir}/#{test_num}" |
|
162 | FileUtils.mv "#{sandbox_dir}/comment", "#{test_result_dir}/#{test_num}" |
|
157 | } |
|
163 | } |
|
158 | call_and_log("Cannot copy the output file into #{test_result_dir}/#{test_num}") { |
|
164 | call_and_log("Cannot copy the output file into #{test_result_dir}/#{test_num}") { |
|
159 | FileUtils.mv "#{sandbox_dir}/output.txt", "#{test_result_dir}/#{test_num}" |
|
165 | FileUtils.mv "#{sandbox_dir}/output.txt", "#{test_result_dir}/#{test_num}" |
|
160 | } |
|
166 | } |
|
161 | call_and_log("Cannot clear #{sandbox_dir}") { |
|
167 | call_and_log("Cannot clear #{sandbox_dir}") { |
|
162 | FileUtils.rm_rf(Dir.glob("#{sandbox_dir}/*"), :secure => true) |
|
168 | FileUtils.rm_rf(Dir.glob("#{sandbox_dir}/*"), :secure => true) |
|
163 | } |
|
169 | } |
|
164 | end |
|
170 | end |
|
165 |
|
171 | ||
|
166 | $stdout.print "[done]\n" |
|
172 | $stdout.print "[done]\n" |
You need to be logged in to leave comments.
Login now