Description:
more commenting on script
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r257:98303143aafa - - 3 files changed: 24 inserted, 2 deleted
@@ -75,12 +75,13 | |||
|
75 | 75 | if !FileTest.exist?(problem_home) |
|
76 | 76 | puts "PROBLEM DIR: #{problem_home}" |
|
77 | 77 | raise "engine: No test data." |
|
78 | 78 | end |
|
79 | 79 | |
|
80 | 80 | talk "ENGINE: grading dir at #{grading_dir} is created" |
|
81 | + talk "ENGINE: located problem home at #{problem_home} is created" | |
|
81 | 82 | |
|
82 | 83 | # copy the source script, using lock |
|
83 | 84 | dinit = DirInit::Manager.new(problem_home) |
|
84 | 85 | |
|
85 | 86 | # lock the directory and copy the scripts |
|
86 | 87 | dinit.setup do |
@@ -155,12 +155,14 | |||
|
155 | 155 | begin |
|
156 | 156 | execute("#{problem_home}/script/run #{language} #{test_num} ", "Error occured during execution of the run script") |
|
157 | 157 | rescue |
|
158 | 158 | # do nothing |
|
159 | 159 | end |
|
160 | 160 | |
|
161 | + | |
|
162 | + #copy the output of run script to each test-result folder | |
|
161 | 163 | call_and_log("Cannot create directory #{test_result_dir}/#{test_num}") { |
|
162 | 164 | FileUtils.mkdir "#{test_result_dir}/#{test_num}" |
|
163 | 165 | } |
|
164 | 166 | call_and_log("Cannot copy the result file into #{test_result_dir}/#{test_num}") { |
|
165 | 167 | FileUtils.mv "#{sandbox_dir}/result", "#{test_result_dir}/#{test_num}" |
|
166 | 168 | } |
@@ -1,8 +1,22 | |||
|
1 | 1 | #!/usr/bin/env ruby |
|
2 | 2 | |
|
3 | + ## | |
|
4 | + # This program should be run in the sandbox dir containing the compiled file | |
|
5 | + # (or source file for script language). It will call the sandbox program with | |
|
6 | + # the given input and process the output of the sandbox | |
|
7 | + # | |
|
8 | + # If sandbox exit normally, this program will call the "check" script to do | |
|
9 | + # scoring. Otherwise, it would record the error accordingly | |
|
10 | + # | |
|
11 | + # This program produces several file | |
|
12 | + # * result - the result from check script | |
|
13 | + # * comment - comment from sandbox | |
|
14 | + # * output - output of the program | |
|
15 | + # | |
|
16 | + | |
|
3 | 17 | require 'fileutils' |
|
4 | 18 | |
|
5 | 19 | def log(str='') |
|
6 | 20 | if ENV['TALKATIVE']!=nil |
|
7 | 21 | puts str |
|
8 | 22 | end |
@@ -26,12 +40,17 | |||
|
26 | 40 | end |
|
27 | 41 | |
|
28 | 42 | def compile_box(source,bin) |
|
29 | 43 | system("g++ #{source} -o #{bin}") |
|
30 | 44 | end |
|
31 | 45 | |
|
46 | + #------------------------------------------ | |
|
47 | + # MAIN | |
|
48 | + #------------------------------------------ | |
|
49 | + | |
|
50 | + #parse parameter | |
|
32 | 51 | if ARGV.length < 2 || ARGV.length > 3 |
|
33 | 52 | puts "Usage: run <language> <test-num> [<program-name>]" |
|
34 | 53 | exit(127) |
|
35 | 54 | end |
|
36 | 55 | |
|
37 | 56 | language = ARGV[0] |
@@ -48,19 +67,19 | |||
|
48 | 67 | load "#{problem_home}/test_cases/all_tests.cfg" |
|
49 | 68 | problem = Problem.get_instance |
|
50 | 69 | |
|
51 | 70 | sandbox_dir = Dir.getwd |
|
52 | 71 | |
|
53 | 72 | if problem.well_formed? == false |
|
54 | - log "RUN: The problem specification is not well formed." | |
|
73 | + log "RUN: ERROR: The problem specification is not well formed." | |
|
55 | 74 | exit(127) |
|
56 | 75 | end |
|
57 | 76 | |
|
58 | 77 | # Check if the test number is okay. |
|
59 | 78 | if test_num <= 0 || test_num > problem.num_tests |
|
60 | - log "RUN: You have specified a wrong test number." | |
|
79 | + log "RUN: ERROR: You have specified a wrong test number." | |
|
61 | 80 | exit(127) |
|
62 | 81 | end |
|
63 | 82 | |
|
64 | 83 | ##################################### |
|
65 | 84 | # Set the relavant file names here. # |
|
66 | 85 | ##################################### |
You need to be logged in to leave comments.
Login now