Description:
Merge branch 'master' into windows
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r125:430281f7813c - - 4 files changed: 23 inserted, 2 deleted
@@ -0,0 +1,14 | |||
|
1 | + require 'rake' | |
|
2 | + require 'spec/rake/spectask' | |
|
3 | + | |
|
4 | + desc "Run all examples" | |
|
5 | + Spec::Rake::SpecTask.new('spec') do |t| | |
|
6 | + t.spec_files = FileList['*spec.rb'] | |
|
7 | + end | |
|
8 | + | |
|
9 | + desc "Run all examples with RCov" | |
|
10 | + Spec::Rake::SpecTask.new('spec_with_rcov') do |t| | |
|
11 | + t.spec_files = FileList['*spec.rb'] | |
|
12 | + t.rcov = true | |
|
13 | + t.rcov_opts = ['--exclude', '.*_spec\.rb'] | |
|
14 | + end |
@@ -6,98 +6,98 | |||
|
6 | 6 | # |
|
7 | 7 | # A grader engine grades a submission, against anything: a test |
|
8 | 8 | # data, or a user submitted test data. It uses two helpers objects: |
|
9 | 9 | # room_maker and reporter. |
|
10 | 10 | # |
|
11 | 11 | class Engine |
|
12 | 12 | |
|
13 | 13 | attr_writer :room_maker |
|
14 | 14 | attr_writer :reporter |
|
15 | 15 | |
|
16 | 16 | def initialize(options={}) |
|
17 | 17 | # default options |
|
18 | 18 | if not options.include? :room_maker |
|
19 | 19 | options[:room_maker] = Grader::SubmissionRoomMaker.new |
|
20 | 20 | end |
|
21 | 21 | if not options.include? :reporter |
|
22 | 22 | options[:reporter] = Grader::SubmissionReporter.new |
|
23 | 23 | end |
|
24 | 24 | |
|
25 | 25 | @config = Grader::Configuration.get_instance |
|
26 | 26 | |
|
27 | 27 | @room_maker = options[:room_maker] |
|
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 | - # FIX THIS | |
|
55 | - talk 'some hack on language' | |
|
54 | + # This is needed because older version of std-scripts/compile | |
|
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 | 76 | raise "No test data." |
|
77 | 77 | end |
|
78 | 78 | |
|
79 | 79 | dinit = DirInit::Manager.new(problem_home) |
|
80 | 80 | |
|
81 | 81 | dinit.setup do |
|
82 | 82 | copy_log = copy_script(problem_home) |
|
83 | 83 | save_copy_log(problem_home,copy_log) |
|
84 | 84 | end |
|
85 | 85 | |
|
86 | 86 | call_judge(problem_home,language,grading_dir,source_name) |
|
87 | 87 | |
|
88 | 88 | @reporter.report(submission,"#{grading_dir}/test-result") |
|
89 | 89 | |
|
90 | 90 | dinit.teardown do |
|
91 | 91 | copy_log = load_copy_log(problem_home) |
|
92 | 92 | clear_copy_log(problem_home) |
|
93 | 93 | clear_script(copy_log,problem_home) |
|
94 | 94 | end |
|
95 | 95 | |
|
96 | 96 | rescue RuntimeError => msg |
|
97 | 97 | @reporter.report_error(submission, msg) |
|
98 | 98 | |
|
99 | 99 | ensure |
|
100 | 100 | @room_maker.clean_up(submission) |
|
101 | 101 | Dir.chdir(current_dir) # this is really important |
|
102 | 102 | end |
|
103 | 103 | end |
@@ -32,78 +32,82 | |||
|
32 | 32 | PASCAL_OPTIONS = "-O1 -XS -dCONTEST" |
|
33 | 33 | |
|
34 | 34 | # Check for the correct number of arguments. Otherwise, print usage. |
|
35 | 35 | if ARGV.length == 0 or ARGV.length > 4 |
|
36 | 36 | puts "Usage: compile <language> [<source-file>] [<output-file>] [<message-file>]" |
|
37 | 37 | puts |
|
38 | 38 | puts "<source-file> is defaulted to \"source\"." |
|
39 | 39 | puts "<output-file> is defaulted to \"a.out\"." |
|
40 | 40 | puts "<message-file> is defaulted to \"compiler_message\"." |
|
41 | 41 | puts |
|
42 | 42 | exit(127) |
|
43 | 43 | end |
|
44 | 44 | |
|
45 | 45 | PARAMS = { |
|
46 | 46 | :source_file => [1,'source'], |
|
47 | 47 | :output_file => [2,'a.out'], |
|
48 | 48 | :message_file => [3,'compiler_message'] |
|
49 | 49 | } |
|
50 | 50 | |
|
51 | 51 | params = {} |
|
52 | 52 | params[:prog_lang] = ARGV[0] |
|
53 | 53 | PARAMS.each_key do |param_name| |
|
54 | 54 | index, default = PARAMS[param_name] |
|
55 | 55 | if ARGV.length > index |
|
56 | 56 | params[param_name] = ARGV[index] |
|
57 | 57 | else |
|
58 | 58 | params[param_name] = default |
|
59 | 59 | end |
|
60 | 60 | talk "#{param_name}: #{params[param_name]}" |
|
61 | 61 | end |
|
62 | 62 | |
|
63 | 63 | # Remove any remaining output files or message files. |
|
64 | 64 | if FileTest.exists? params[:output_file] |
|
65 | 65 | FileUtils.rm(params[:output_file]) |
|
66 | 66 | end |
|
67 | 67 | if FileTest.exists? params[:message_file] |
|
68 | 68 | FileUtils.rm(params[:message_file]) |
|
69 | 69 | end |
|
70 | 70 | |
|
71 | 71 | # Check if the source file exists before attempt compiling. |
|
72 | 72 | if !FileTest.exists? params[:source_file] |
|
73 | 73 | talk("ERROR: The source file does not exist!") |
|
74 | 74 | open(params[:message_file],"w") do |f| |
|
75 | 75 | f.puts "ERROR: The source file did not exist." |
|
76 | 76 | end |
|
77 | 77 | exit(127) |
|
78 | 78 | end |
|
79 | 79 | |
|
80 | + if params[:prog_lang]=='cpp': | |
|
81 | + params[:prog_lang] = 'c++' | |
|
82 | + end | |
|
83 | + | |
|
80 | 84 | # Compile. |
|
81 | 85 | case params[:prog_lang] |
|
82 | 86 | |
|
83 | 87 | when "c" |
|
84 | 88 | command = "#{C_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{C_OPTIONS} 2> #{params[:message_file]}" |
|
85 | 89 | system(command) |
|
86 | 90 | |
|
87 | 91 | when "c++" |
|
88 | 92 | command = "#{CPLUSPLUS_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{CPLUSPLUS_OPTIONS} 2> #{params[:message_file]}" |
|
89 | 93 | system(command) |
|
90 | 94 | |
|
91 | 95 | when "pas" |
|
92 | 96 | command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS} > #{params[:message_file]}" |
|
93 | 97 | system(command) |
|
94 | 98 | FileUtils.mv("output", params[:output_file]) |
|
95 | 99 | |
|
96 | 100 | else |
|
97 | 101 | talk("ERROR: Invalid language specified!") |
|
98 | 102 | open(params[:message_file],"w") do |f| |
|
99 | 103 | f.puts "ERROR: Invalid language specified!" |
|
100 | 104 | end |
|
101 | 105 | exit(127) |
|
102 | 106 | end |
|
103 | 107 | |
|
104 | 108 | # Report success or failure. |
|
105 | 109 | if FileTest.exists? params[:output_file] |
|
106 | 110 | talk "Compilation was successful!" |
|
107 | 111 | else |
|
108 | 112 | talk "ERROR: Something was wrong during the compilation!" |
|
109 | 113 | end |
You need to be logged in to leave comments.
Login now