cafe-grader-judge-scripts

Commit r149:84ba9b0dee25 public

parent | child
Description:
merge bugfix from the main branch
Commit status:
[Not Reviewed]
References:
merge algo
Diff options:
Raw Diff | Patch Diff | Download Diff | Show 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

r149:84ba9b0dee25 - - 2 files changed: 4 inserted, 2 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -28,96 +28,98
28 @reporter = options[:reporter]
28 @reporter = options[:reporter]
29 end
29 end
30
30
31 # takes a submission, asks room_maker to produce grading directories,
31 # takes a submission, asks room_maker to produce grading directories,
32 # calls grader scripts, and asks reporter to save the result
32 # calls grader scripts, and asks reporter to save the result
33 def grade(submission)
33 def grade(submission)
34 current_dir = FileUtils.pwd
34 current_dir = FileUtils.pwd
35
35
36 user = submission.user
36 user = submission.user
37 problem = submission.problem
37 problem = submission.problem
38
38
39 # TODO: will have to create real exception for this
39 # TODO: will have to create real exception for this
40 if user==nil or problem == nil
40 if user==nil or problem == nil
41 @reporter.report_error(submission,"Grading error: problem with submission")
41 @reporter.report_error(submission,"Grading error: problem with submission")
42 #raise "engine: user or problem is nil"
42 #raise "engine: user or problem is nil"
43 end
43 end
44
44
45 # TODO: this is another hack so that output only task can be judged
45 # TODO: this is another hack so that output only task can be judged
46 if submission.language!=nil
46 if submission.language!=nil
47 language = submission.language.name
47 language = submission.language.name
48 lang_ext = submission.language.ext
48 lang_ext = submission.language.ext
49 else
49 else
50 language = 'c'
50 language = 'c'
51 lang_ext = 'c'
51 lang_ext = 'c'
52 end
52 end
53
53
54 # This is needed because older version of std-scripts/compile
54 # This is needed because older version of std-scripts/compile
55 # only look for c++.
55 # only look for c++.
56 if language == 'cpp'
56 if language == 'cpp'
57 language = 'c++'
57 language = 'c++'
58 end
58 end
59
59
60 # COMMENT: should it be only source.ext?
60 # COMMENT: should it be only source.ext?
61 if problem!=nil
61 if problem!=nil
62 source_name = "#{problem.name}.#{lang_ext}"
62 source_name = "#{problem.name}.#{lang_ext}"
63 else
63 else
64 source_name = "source.#{lang_ext}"
64 source_name = "source.#{lang_ext}"
65 end
65 end
66
66
67 begin
67 begin
68 grading_dir = @room_maker.produce_grading_room(submission)
68 grading_dir = @room_maker.produce_grading_room(submission)
69 @room_maker.save_source(submission,source_name)
69 @room_maker.save_source(submission,source_name)
70 problem_home = @room_maker.find_problem_home(submission)
70 problem_home = @room_maker.find_problem_home(submission)
71
71
72 # puts "GRADING DIR: #{grading_dir}"
72 # puts "GRADING DIR: #{grading_dir}"
73 # puts "PROBLEM DIR: #{problem_home}"
73 # puts "PROBLEM DIR: #{problem_home}"
74
74
75 if !FileTest.exist?(problem_home)
75 if !FileTest.exist?(problem_home)
76 + puts "PROBLEM DIR: #{problem_home}"
77 + puts "No test data. (check problem dir)"
76 raise "No test data."
78 raise "No test data."
77 end
79 end
78
80
79 dinit = DirInit::Manager.new(problem_home)
81 dinit = DirInit::Manager.new(problem_home)
80
82
81 dinit.setup do
83 dinit.setup do
82 copy_log = copy_script(problem_home)
84 copy_log = copy_script(problem_home)
83 save_copy_log(problem_home,copy_log)
85 save_copy_log(problem_home,copy_log)
84 end
86 end
85
87
86 call_judge(problem_home,language,grading_dir,source_name)
88 call_judge(problem_home,language,grading_dir,source_name)
87
89
88 @reporter.report(submission,"#{grading_dir}/test-result")
90 @reporter.report(submission,"#{grading_dir}/test-result")
89
91
90 dinit.teardown do
92 dinit.teardown do
91 copy_log = load_copy_log(problem_home)
93 copy_log = load_copy_log(problem_home)
92 clear_copy_log(problem_home)
94 clear_copy_log(problem_home)
93 clear_script(copy_log,problem_home)
95 clear_script(copy_log,problem_home)
94 end
96 end
95
97
96 rescue RuntimeError => msg
98 rescue RuntimeError => msg
97 @reporter.report_error(submission, msg)
99 @reporter.report_error(submission, msg)
98
100
99 ensure
101 ensure
100 @room_maker.clean_up(submission)
102 @room_maker.clean_up(submission)
101 Dir.chdir(current_dir) # this is really important
103 Dir.chdir(current_dir) # this is really important
102 end
104 end
103 end
105 end
104
106
105 protected
107 protected
106
108
107 def talk(str)
109 def talk(str)
108 if @config.talkative
110 if @config.talkative
109 puts str
111 puts str
110 end
112 end
111 end
113 end
112
114
113 def call_judge(problem_home,language,grading_dir,fname)
115 def call_judge(problem_home,language,grading_dir,fname)
114 ENV['PROBLEM_HOME'] = problem_home
116 ENV['PROBLEM_HOME'] = problem_home
115 ENV['RUBYOPT'] = ''
117 ENV['RUBYOPT'] = ''
116
118
117 talk grading_dir
119 talk grading_dir
118 Dir.chdir grading_dir
120 Dir.chdir grading_dir
119 cmd = "#{problem_home}/script/judge #{language} #{fname}"
121 cmd = "#{problem_home}/script/judge #{language} #{fname}"
120 talk "CMD: #{cmd}"
122 talk "CMD: #{cmd}"
121 system(cmd)
123 system(cmd)
122 end
124 end
123
125
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,69 +1,69
1 #!/usr/bin/env ruby
1 #!/usr/bin/env ruby
2
2
3 require 'fileutils'
3 require 'fileutils'
4
4
5 ##############################
5 ##############################
6 #
6 #
7 # Standard Compile Script
7 # Standard Compile Script
8 #
8 #
9 # Supported compilers:
9 # Supported compilers:
10 # gcc, g++, and fpc.
10 # gcc, g++, and fpc.
11 #
11 #
12 ##############################
12 ##############################
13
13
14 - def talk(msg)
14 + def talk(str='')
15 if ENV['TALKATIVE']!=nil
15 if ENV['TALKATIVE']!=nil
16 puts str
16 puts str
17 end
17 end
18 if ENV['GRADER_LOGGING']!=nil
18 if ENV['GRADER_LOGGING']!=nil
19 log_fname = ENV['GRADER_LOGGING']
19 log_fname = ENV['GRADER_LOGGING']
20 fp = File.open(log_fname,"a")
20 fp = File.open(log_fname,"a")
21 - fp.puts("run: #{Time.new.strftime("%H:%M")} #{msg}")
21 + fp.puts("run: #{Time.new.strftime("%H:%M")} #{str}")
22 fp.close
22 fp.close
23 end
23 end
24 end
24 end
25
25
26 C_COMPILER = "/usr/bin/gcc"
26 C_COMPILER = "/usr/bin/gcc"
27 CPLUSPLUS_COMPILER = "/usr/bin/g++"
27 CPLUSPLUS_COMPILER = "/usr/bin/g++"
28 PASCAL_COMPILER = "/usr/bin/fpc"
28 PASCAL_COMPILER = "/usr/bin/fpc"
29 JAVA_COMPILER = "/usr/bin/javac"
29 JAVA_COMPILER = "/usr/bin/javac"
30 RUBY_INTEPRETER = "/home/dae/.rvm/rubies/ruby-1.9.2-p320/bin/ruby"
30 RUBY_INTEPRETER = "/home/dae/.rvm/rubies/ruby-1.9.2-p320/bin/ruby"
31
31
32 C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall"
32 C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall"
33 CPLUSPLUS_OPTIONS = "-O2 -s -static -DCONTEST -lm -Wall"
33 CPLUSPLUS_OPTIONS = "-O2 -s -static -DCONTEST -lm -Wall"
34 PASCAL_OPTIONS = "-O1 -XS -dCONTEST"
34 PASCAL_OPTIONS = "-O1 -XS -dCONTEST"
35 JAVA_OPTIONS = ""
35 JAVA_OPTIONS = ""
36
36
37 # Check for the correct number of arguments. Otherwise, print usage.
37 # Check for the correct number of arguments. Otherwise, print usage.
38 if ARGV.length == 0 or ARGV.length > 4
38 if ARGV.length == 0 or ARGV.length > 4
39 puts "Usage: compile <language> [<source-file>] [<output-file>] [<message-file>]"
39 puts "Usage: compile <language> [<source-file>] [<output-file>] [<message-file>]"
40 puts
40 puts
41 puts "<source-file> is defaulted to \"source\"."
41 puts "<source-file> is defaulted to \"source\"."
42 puts "<output-file> is defaulted to \"a.out\"."
42 puts "<output-file> is defaulted to \"a.out\"."
43 puts "<message-file> is defaulted to \"compiler_message\"."
43 puts "<message-file> is defaulted to \"compiler_message\"."
44 puts
44 puts
45 exit(127)
45 exit(127)
46 end
46 end
47
47
48 PARAMS = {
48 PARAMS = {
49 :source_file => [1,'source'],
49 :source_file => [1,'source'],
50 :output_file => [2,'a.out'],
50 :output_file => [2,'a.out'],
51 :message_file => [3,'compiler_message']
51 :message_file => [3,'compiler_message']
52 }
52 }
53
53
54 params = {}
54 params = {}
55 params[:prog_lang] = ARGV[0]
55 params[:prog_lang] = ARGV[0]
56 PARAMS.each_key do |param_name|
56 PARAMS.each_key do |param_name|
57 index, default = PARAMS[param_name]
57 index, default = PARAMS[param_name]
58 if ARGV.length > index
58 if ARGV.length > index
59 params[param_name] = ARGV[index]
59 params[param_name] = ARGV[index]
60 else
60 else
61 params[param_name] = default
61 params[param_name] = default
62 end
62 end
63 talk "#{param_name}: #{params[param_name]}"
63 talk "#{param_name}: #{params[param_name]}"
64 end
64 end
65
65
66 # Remove any remaining output files or message files.
66 # Remove any remaining output files or message files.
67 if FileTest.exists? params[:output_file]
67 if FileTest.exists? params[:output_file]
68 FileUtils.rm(params[:output_file])
68 FileUtils.rm(params[:output_file])
69 end
69 end
You need to be logged in to leave comments. Login now