Description:
Merge pull request #10 from wytesk133/master
Fixed some Ruby scripts
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r206:cf0534046f00 - - 8 files changed: 11 inserted, 11 deleted
@@ -1,7 +1,7 | |||||
|
1 | - #!/usr/bin/ruby |
|
1 | + #!/usr/bin/env ruby |
|
2 |
|
2 | ||
|
3 | # new_problem: |
|
3 | # new_problem: |
|
4 | # * creates a directory for a problem in the current directory, |
|
4 | # * creates a directory for a problem in the current directory, |
|
5 | # * create standard testcase config file |
|
5 | # * create standard testcase config file |
|
6 |
|
6 | ||
|
7 | require 'erb' |
|
7 | require 'erb' |
@@ -1,7 +1,7 | |||||
|
1 | - #!/usr/bin/ruby |
|
1 | + #!/usr/bin/env ruby |
|
2 |
|
2 | ||
|
3 | # |
|
3 | # |
|
4 | # This is a check script wrapper. It read all required information |
|
4 | # This is a check script wrapper. It read all required information |
|
5 | # and call a real check script call REAL_CHECK_SCRIPT in directory |
|
5 | # and call a real check script call REAL_CHECK_SCRIPT in directory |
|
6 | # [problem_home]/script |
|
6 | # [problem_home]/script |
|
7 | # |
|
7 | # |
@@ -1,7 +1,7 | |||||
|
1 | - #!/usr/bin/ruby |
|
1 | + #!/usr/bin/env ruby |
|
2 |
|
2 | ||
|
3 | problem_home = ENV['PROBLEM_HOME'] |
|
3 | problem_home = ENV['PROBLEM_HOME'] |
|
4 | require "#{problem_home}/script/test_dsl.rb" |
|
4 | require "#{problem_home}/script/test_dsl.rb" |
|
5 |
|
5 | ||
|
6 | if ARGV.length < 2 |
|
6 | if ARGV.length < 2 |
|
7 | puts "Usage: check <language> <test-number> [<output-file>]" |
|
7 | puts "Usage: check <language> <test-number> [<output-file>]" |
@@ -1,7 +1,7 | |||||
|
1 | - #!/usr/bin/ruby |
|
1 | + #!/usr/bin/env ruby |
|
2 |
|
2 | ||
|
3 | problem_home = ENV['PROBLEM_HOME'] |
|
3 | problem_home = ENV['PROBLEM_HOME'] |
|
4 | require "#{problem_home}/script/test_dsl.rb" |
|
4 | require "#{problem_home}/script/test_dsl.rb" |
|
5 |
|
5 | ||
|
6 | if ARGV.length < 2 |
|
6 | if ARGV.length < 2 |
|
7 | puts "Usage: check <language> <test-number> [<output-file>]" |
|
7 | puts "Usage: check <language> <test-number> [<output-file>]" |
@@ -1,7 +1,7 | |||||
|
1 | - #!/usr/bin/ruby |
|
1 | + #!/usr/bin/env ruby |
|
2 |
|
2 | ||
|
3 | problem_home = ENV['PROBLEM_HOME'] |
|
3 | problem_home = ENV['PROBLEM_HOME'] |
|
4 | require "#{problem_home}/script/test_dsl.rb" |
|
4 | require "#{problem_home}/script/test_dsl.rb" |
|
5 |
|
5 | ||
|
6 | if ARGV.length < 2 |
|
6 | if ARGV.length < 2 |
|
7 | puts "Usage: check <language> <test-number> [<output-file>]" |
|
7 | puts "Usage: check <language> <test-number> [<output-file>]" |
@@ -1,7 +1,7 | |||||
|
1 | - #!/usr/bin/ruby |
|
1 | + #!/usr/bin/env ruby |
|
2 |
|
2 | ||
|
3 | problem_home = ENV['PROBLEM_HOME'] |
|
3 | problem_home = ENV['PROBLEM_HOME'] |
|
4 | require "#{problem_home}/script/test_dsl.rb" |
|
4 | require "#{problem_home}/script/test_dsl.rb" |
|
5 |
|
5 | ||
|
6 | if ARGV.length < 2 |
|
6 | if ARGV.length < 2 |
|
7 | puts "Usage: check <language> <test-number> [<output-file>]" |
|
7 | puts "Usage: check <language> <test-number> [<output-file>]" |
@@ -1,7 +1,7 | |||||
|
1 | - #!/usr/bin/ruby |
|
1 | + #!/usr/bin/env ruby |
|
2 |
|
2 | ||
|
3 | problem_home = ENV['PROBLEM_HOME'] |
|
3 | problem_home = ENV['PROBLEM_HOME'] |
|
4 | require "#{problem_home}/script/test_dsl.rb" |
|
4 | require "#{problem_home}/script/test_dsl.rb" |
|
5 |
|
5 | ||
|
6 | if ARGV.length < 2 |
|
6 | if ARGV.length < 2 |
|
7 | puts "Usage: check <language> <test-number> [<output-file>]" |
|
7 | puts "Usage: check <language> <test-number> [<output-file>]" |
@@ -199,13 +199,13 | |||||
|
199 | :and_report => { |
|
199 | :and_report => { |
|
200 | :graded_at= => nil, |
|
200 | :graded_at= => nil, |
|
201 | :compiler_message= => '', |
|
201 | :compiler_message= => '', |
|
202 | :grader_comment= => '', |
|
202 | :grader_comment= => '', |
|
203 | :running_stat= => /0.0\d* sec./, |
|
203 | :running_stat= => /0.0\d* sec./, |
|
204 | :output_file_name= => lambda { |fname| |
|
204 | :output_file_name= => lambda { |fname| |
|
205 |
- File.exists?(fname).should be |
|
205 | + File.exists?(fname).should be true |
|
206 | }, |
|
206 | }, |
|
207 | :running_time= => nil, |
|
207 | :running_time= => nil, |
|
208 | :exit_status= => nil, |
|
208 | :exit_status= => nil, |
|
209 | :memory_usage= => nil, |
|
209 | :memory_usage= => nil, |
|
210 | :save => nil}) |
|
210 | :save => nil}) |
|
211 | end |
|
211 | end |
@@ -223,13 +223,13 | |||||
|
223 | :running_stat= => nil, |
|
223 | :running_stat= => nil, |
|
224 | :output_file_name= => nil, |
|
224 | :output_file_name= => nil, |
|
225 | :running_time= => nil, |
|
225 | :running_time= => nil, |
|
226 | :exit_status= => nil, |
|
226 | :exit_status= => nil, |
|
227 | :memory_usage= => nil, |
|
227 | :memory_usage= => nil, |
|
228 | :save => nil}) |
|
228 | :save => nil}) |
|
229 |
- File.exists?(@config.user_result_dir + "/test_request/test_normal/test_cases/1/input-1.txt").should be |
|
229 | + File.exists?(@config.user_result_dir + "/test_request/test_normal/test_cases/1/input-1.txt").should be false |
|
230 | end |
|
230 | end |
|
231 |
|
231 | ||
|
232 | it "should compile test request with error and report compilation error" do |
|
232 | it "should compile test request with error and report compilation error" do |
|
233 | problem = stub(Problem, |
|
233 | problem = stub(Problem, |
|
234 | :id => 1, :name => 'test_normal') |
|
234 | :id => 1, :name => 'test_normal') |
|
235 | grader_should(:grade => 'test1_compile_error.c', |
|
235 | grader_should(:grade => 'test1_compile_error.c', |
@@ -252,13 +252,13 | |||||
|
252 | :and_report => { |
|
252 | :and_report => { |
|
253 | :graded_at= => nil, |
|
253 | :graded_at= => nil, |
|
254 | :compiler_message= => '', |
|
254 | :compiler_message= => '', |
|
255 | :grader_comment= => '', |
|
255 | :grader_comment= => '', |
|
256 | :running_stat= => /[Ee]xit.*status.*10.*0\.0\d* sec/m, |
|
256 | :running_stat= => /[Ee]xit.*status.*10.*0\.0\d* sec/m, |
|
257 | :output_file_name= => lambda { |fname| |
|
257 | :output_file_name= => lambda { |fname| |
|
258 |
- File.exists?(fname).should be |
|
258 | + File.exists?(fname).should be true |
|
259 | }, |
|
259 | }, |
|
260 | :running_time= => nil, |
|
260 | :running_time= => nil, |
|
261 | :exit_status= => /10/, |
|
261 | :exit_status= => /10/, |
|
262 | :memory_usage= => nil, |
|
262 | :memory_usage= => nil, |
|
263 | :save => nil}) |
|
263 | :save => nil}) |
|
264 | end |
|
264 | end |
@@ -272,13 +272,13 | |||||
|
272 | :and_report => { |
|
272 | :and_report => { |
|
273 | :graded_at= => nil, |
|
273 | :graded_at= => nil, |
|
274 | :compiler_message= => '', |
|
274 | :compiler_message= => '', |
|
275 | :grader_comment= => '', |
|
275 | :grader_comment= => '', |
|
276 | :running_stat= => nil, |
|
276 | :running_stat= => nil, |
|
277 | :output_file_name= => lambda { |fname| |
|
277 | :output_file_name= => lambda { |fname| |
|
278 |
- File.exists?(fname).should be |
|
278 | + File.exists?(fname).should be true |
|
279 | }, |
|
279 | }, |
|
280 | :running_time= => lambda { |t| |
|
280 | :running_time= => lambda { |t| |
|
281 | (t>=0.14) and (t<=0.16) |
|
281 | (t>=0.14) and (t<=0.16) |
|
282 | }, |
|
282 | }, |
|
283 | :exit_status= => nil, |
|
283 | :exit_status= => nil, |
|
284 | :memory_usage= => lambda { |s| |
|
284 | :memory_usage= => lambda { |s| |
You need to be logged in to leave comments.
Login now