cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

Commit `r195:3eff00360356` public

parent | child

Description:

Merge pull request #3 from nattee/master Quick fix for grader crash problem

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

r195:3eff00360356 - Tue, 12 Aug 2014 20:17:45 - 3 files changed: 9 inserted, 7 deleted

grader ¶ +1 -1

               def grader_grade_submissions(grader_proc, options)
                 engine = Grader::Engine.new
                 runner = Grader::Runner.new(engine, grader_proc)
                 grader_proc.report_active if grader_proc!=nil
                 ARGV.each do |sub_id|
                   puts "Grading #{sub_id}"
                   begin
                     submission = Submission.find(sub_id.to_i)
                   rescue ActiveRecord::RecordNotFound
-            -       puts "Record not found"
+            +       puts "Submission #{sub_id} not found"
                     submission = nil
                   end
                   if submission!=nil
                     runner.grade_submission(submission)
                   end
                 end
               end
               #########################################
               # main program
               #########################################

lib/engine.rb ¶ +6 -4

                     @room_maker = options[:room_maker]
                     @reporter = options[:reporter]
                   end
                   # 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
+            +       begin
                       # 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"
+            +           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
                       # This is needed because older version of std-scripts/compile
                       # 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."
+            +           puts "PROBLEM DIR: #{problem_home}"
+            +           raise "engine: No test data."
                       end
                       dinit = DirInit::Manager.new(problem_home)
                       dinit.setup do
                         copy_log = copy_script(problem_home)
                         save_copy_log(problem_home,copy_log)
                       end
                       call_judge(problem_home,language,grading_dir,source_name)
                       @reporter.report(submission,"#{grading_dir}/test-result")
                       dinit.teardown do
                         copy_log = load_copy_log(problem_home)
                         clear_copy_log(problem_home)
                         clear_script(copy_log,problem_home)
                       end
                     rescue RuntimeError => msg
                       @reporter.report_error(submission, msg)
+            +         puts "ERROR: #{msg}"
                     ensure
                       @room_maker.clean_up(submission)
                       Dir.chdir(current_dir)   # this is really important
                     end
                   end
                   protected
                   def talk(str)
                     if @config.talkative
                       puts str
                     talk "CMD: #{cmd}"
                     system(cmd)
                   end
                   def get_std_script_dir
                     GRADER_ROOT + '/std-script'
                   end
                   def copy_script(problem_home)
                     script_dir = "#{problem_home}/script"
                     std_script_dir = get_std_script_dir
-            -       raise "std-script directory not found" if !FileTest.exist?(std_script_dir)
+            +       raise "engine: std-script directory not found" if !FileTest.exist?(std_script_dir)
                     scripts = Dir[std_script_dir + '/*']
                     copied = []
                     scripts.each do |s|
                       fname = File.basename(s)
                       next if FileTest.directory?(s)
                       if !FileTest.exist?("#{script_dir}/#{fname}")
                         copied << fname
                         FileUtils.cp(s, "#{script_dir}", :preserve => true)
                       end

std-script/compile ¶ +2 -2

               require 'fileutils'
               ##############################
               #
               # Standard Compile Script
               #
               # Supported compilers:
               #   gcc, g++, and fpc.
               #
               ##############################
-            - def talk(msg)
+            + def talk(str='')
                 if ENV['TALKATIVE']!=nil
                   puts str
                 end
                 if ENV['GRADER_LOGGING']!=nil
                   log_fname = ENV['GRADER_LOGGING']
                   fp = File.open(log_fname,"a")
-            -     fp.puts("run: #{Time.new.strftime("%H:%M")} #{msg}")
+            +     fp.puts("run: #{Time.new.strftime("%H:%M")} #{str}")
                   fp.close
                 end
               end
               C_COMPILER = "/usr/bin/gcc"
               CPLUSPLUS_COMPILER = "/usr/bin/g++"
               PASCAL_COMPILER = "/usr/bin/fpc"
               C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall"
               CPLUSPLUS_OPTIONS = "-O2 -s -static -DCONTEST -lm -Wall"
               PASCAL_OPTIONS = "-O1 -XS -dCONTEST"

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

r195:3eff00360356 - Tue, 12 Aug 2014 20:17:45 - 3 files changed: 9 inserted, 7 deleted

Sign in to your account

Commit r195:3eff00360356 public

Author

r195:3eff00360356 - Tue, 12 Aug 2014 20:17:45 - 3 files changed: 9 inserted, 7 deleted

Commit `r195:3eff00360356` public