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: 33 inserted, 31 deleted

grader ¶ +1 -1

                 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

lib/engine.rb ¶ +30 -28

                   def grade(submission)
                     current_dir = FileUtils.pwd
                     user = submission.user
                     problem = submission.problem
-            -       # TODO: will have to create real exception for this
+            +       begin
-            -       if user==nil or problem == nil
+            +         # TODO: will have to create real exception for this
-            -         @reporter.report_error(submission,"Grading error: problem with submission")
+            +         if user==nil or problem == nil
-            -         #raise "engine: user or problem is nil"
+            +           @reporter.report_error(submission,"Grading error: problem with submission")
-            -       end
+            +           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
+            +         # TODO: this is another hack so that output only task can be judged
-            -       # only look for c++.
+            +         if submission.language!=nil
-            -       if language == 'cpp'
+            +           language = submission.language.name
-            -         language = 'c++'
+            +           lang_ext = submission.language.ext
-            -       end
+            +         else
+            +           language = 'c'
+            +           lang_ext = 'c'
+            +         end
-            -       # COMMENT: should it be only source.ext?
+            +         # This is needed because older version of std-scripts/compile
-            -       if problem!=nil
+            +         # only look for c++.
-            -         source_name = "#{problem.name}.#{lang_ext}"
+            +         if language == 'cpp'
-            -       else
+            +           language = 'c++'
-            -         source_name = "source.#{lang_ext}"
+            +         end
-            -       end
-            -       begin
+            +         # COMMENT: should it be only source.ext?
+            +         if problem!=nil
+            +           source_name = "#{problem.name}.#{lang_ext}"
+            +         else
+            +           source_name = "source.#{lang_ext}"
+            +         end
+            +
                       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)
                         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
                   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|

std-script/compile ¶ +2 -2

               #
               # 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++"

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: 33 inserted, 31 deleted

Sign in to your account

Commit r195:3eff00360356 public

Author

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

Commit `r195:3eff00360356` public