cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

Commit `r111:06c23d391544` public

parent | child

Description:

added quick hack on running scripts, and compiler calls

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r111:06c23d391544 - Sun, 25 Apr 2010 05:35:10 - 4 files changed: 13 inserted, 11 deleted

lib/engine.rb ¶ +1 -1

                     Dir.chdir grading_dir
                     cmd = "#{problem_home}/script/judge #{language} #{fname}"
                     talk "CMD: #{cmd}"
-            -       system(cmd)
+            +       system("ruby " + cmd)
                   end
                   def get_std_script_dir

std-script/compile ¶ +3 -3

                 end
               end
-            - C_COMPILER = "/usr/bin/gcc"
+            + C_COMPILER = "gcc"
-            - CPLUSPLUS_COMPILER = "/usr/bin/g++"
+            + CPLUSPLUS_COMPILER = "g++"
-            - PASCAL_COMPILER = "/usr/bin/fpc"
+            + PASCAL_COMPILER = "fpc"
               C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall"
               CPLUSPLUS_OPTIONS = "-O2 -s -static -DCONTEST -lm -Wall"

std-script/judge ¶ +7 -5

                 log "ERROR: Cannot change directory to #{sandbox_dir}."
                 exit(127)
               end
-            - execute("#{problem_home}/script/compile #{language} #{source_file}", "Compilation error!")
+            + execute("ruby #{problem_home}/script/compile #{language} #{source_file}", "Compilation error!")
-            - compile_message = open("compiler_message").read
+            + open("compiler_message") do |f|
-            - compile_message.strip!
+            +   compile_message = f.read
+            +   compile_message.strip!
+            + end
               call_and_log("Cannot move the compiler message to #{test_result_dir}.") {
                 FileUtils.mv("compiler_message", test_result_dir)
               }
                   FileUtils.cp("#{test_result_dir}/a.out", sandbox_dir)
                 }
                 begin
-            -     execute("#{problem_home}/script/run #{language} #{test_num}", "Error occured during execution of the run script")
+            +     execute("ruby #{problem_home}/script/run #{language} #{test_num}", "Error occured during execution of the run script")
                 rescue
                   # do nothing
                 end
                 log "ERROR: Cannot change directory to #{test_result_dir}."
                 exit(127)
               end
-            - execute("#{problem_home}/script/grade", "An error occured during grading!")
+            + execute("ruby #{problem_home}/script/grade", "An error occured during grading!")
               log
               log "All done!"

std-script/run ¶ +2 -2

               #`cp #{problem_home}/test_cases/#{test_num}/#{input_file_name} .`
               # check if box is there, if not, compile it!
-            - if !File.exists?("#{problem_home}/script/box")
+            + if !File.exists?("#{problem_home}/script/box") and !File.exists?("#{problem_home}/script/box.exe")
                 log "WARNING: Compiling box: to increase efficiency, it should be compile manually"
                 compile_box("#{problem_home}/script/box.cc",
                             "#{problem_home}/script/box")
               check_command = "#{problem_home}/script/check #{language} #{test_num}"
               log "Checking the output..."
               log check_command
-            - if not system(check_command)
+            + if not system("ruby " + check_command)
                 log "Problem with check script"
                 report.call("Incorrect",0,"Check script error.\n")
                 exit(127)

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

r111:06c23d391544 - Sun, 25 Apr 2010 05:35:10 - 4 files changed: 13 inserted, 11 deleted

Sign in to your account

Commit r111:06c23d391544 public

Author

r111:06c23d391544 - Sun, 25 Apr 2010 05:35:10 - 4 files changed: 13 inserted, 11 deleted

Commit `r111:06c23d391544` public