cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

Commit `r125:430281f7813c` public

parent | child

Description:

Merge branch 'master' into windows

Commit status:

[Not Reviewed]

References:

merge default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r125:430281f7813c - Wed, 28 Apr 2010 12:26:12 - 4 files changed: 23 inserted, 2 deleted

test/.gitignore created 644 ¶ +3

@@ -0,0 +1,3
	1	+ sandbox
	2	+ coverage
	3	+

test/rakefile created 644 ¶ +14

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

lib/engine.rb ¶ +2 -2

                   # takes a submission, asks room_maker to produce grading directories,
                   # calls grader scripts, and asks reporter to save the result
                   def grade(submission)
                     current_dir = FileUtils.pwd
                     user = submission.user
                     problem = submission.problem
                     # TODO: will have to create real exception for this
                     if user==nil or problem == nil
                       @reporter.report_error(submission,"Grading error: problem with submission")
                       #raise "engine: user or problem is nil"
                     end
                     # TODO: this is another hack so that output only task can be judged
                     if submission.language!=nil
                       language = submission.language.name
                       lang_ext = submission.language.ext
                     else
                       language = 'c'
                       lang_ext = 'c'
                     end
-            -       # FIX THIS
+            +       # This is needed because older version of std-scripts/compile
-            -       talk 'some hack on language'
+            +       # only look for c++.
                     if language == 'cpp'
                       language = 'c++'
                     end
                     # COMMENT: should it be only source.ext?
                     if problem!=nil
                       source_name = "#{problem.name}.#{lang_ext}"
                     else
                       source_name = "source.#{lang_ext}"
                     end
                     begin
                       grading_dir = @room_maker.produce_grading_room(submission)
                       @room_maker.save_source(submission,source_name)
                       problem_home = @room_maker.find_problem_home(submission)
                       # puts "GRADING DIR: #{grading_dir}"
                       # puts "PROBLEM DIR: #{problem_home}"
                       if !FileTest.exist?(problem_home)
                         raise "No test data."
                       end
                       dinit = DirInit::Manager.new(problem_home)

std-script/compile ¶ +4

                   params[param_name] = ARGV[index]
                 else
                   params[param_name] = default
                 end
                 talk "#{param_name}: #{params[param_name]}"
               end
               # Remove any remaining output files or message files.
               if FileTest.exists? params[:output_file]
                 FileUtils.rm(params[:output_file])
               end
               if FileTest.exists? params[:message_file]
                 FileUtils.rm(params[:message_file])
               end
               # Check if the source file exists before attempt compiling.
               if !FileTest.exists? params[:source_file]
                 talk("ERROR: The source file does not exist!")
                 open(params[:message_file],"w") do |f|
                   f.puts "ERROR: The source file did not exist."
                 end
                 exit(127)
               end
+            + if params[:prog_lang]=='cpp':
+            +     params[:prog_lang] = 'c++'
+            + end
+            +
               # Compile.
               case params[:prog_lang]
                 when "c"
                 command = "#{C_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{C_OPTIONS} 2> #{params[:message_file]}"
                 system(command)
                 when "c++"
                 command = "#{CPLUSPLUS_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{CPLUSPLUS_OPTIONS} 2> #{params[:message_file]}"
                 system(command)
                 when "pas"
                 command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS} > #{params[:message_file]}"
                 system(command)
                 FileUtils.mv("output", params[:output_file])
                 else
                 talk("ERROR: Invalid language specified!")
                 open(params[:message_file],"w") do |f|
                   f.puts "ERROR: Invalid language specified!"
                 end
                 exit(127)
               end

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r125:430281f7813c - Wed, 28 Apr 2010 12:26:12 - 4 files changed: 23 inserted, 2 deleted

Sign in to your account

Commit r125:430281f7813c public

Author

r125:430281f7813c - Wed, 28 Apr 2010 12:26:12 - 4 files changed: 23 inserted, 2 deleted

Commit `r125:430281f7813c` public