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 | 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

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

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