cafe-grader-judge-scripts

Commit r179:9eed5e566314 public

parent | child
Description:
merge
Commit status:
[Not Reviewed]
References:
merge java
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r179:9eed5e566314 - - 2 files changed: 20 inserted, 20 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -84,93 +84,93
84 84 end
85 85 exit(127)
86 86 end
87 87
88 88 if params[:prog_lang]=='cpp'
89 89 params[:prog_lang] = 'c++'
90 90 end
91 91
92 92 # Compile.
93 93 case params[:prog_lang]
94 94
95 95 when "c"
96 - command = "#{C_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{C_OPTIONS} 2> #{params[:message_file]}"
97 - system(command)
96 + command = "#{C_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{C_OPTIONS}"
97 + system(command, err: params[:message_file])
98 98
99 99 when "c++"
100 - command = "#{CPLUSPLUS_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{CPLUSPLUS_OPTIONS} 2> #{params[:message_file]}"
101 - system(command)
100 + command = "#{CPLUSPLUS_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{CPLUSPLUS_OPTIONS}"
101 + system(command, err: params[:message_file])
102 102
103 103 when "pas"
104 - command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS} > #{params[:message_file]}"
105 - system(command)
104 + command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS}"
105 + system(command,out: params[:message_file])
106 106 FileUtils.mv("output", params[:output_file])
107 107
108 108 when "java"
109 109 #rename the file to the public class name
110 110
111 111 #get the class name
112 112 classname = 'DUMMY'
113 113 source = Array.new
114 114 File.foreach(params[:source_file]) do |line|
115 115 md = /\s*public\s*class\s*(\w*)/.match(line)
116 116 classname=md[1] if md
117 117 source << line unless line =~ /\s*package\s*\w+\s*\;/
118 118 end
119 119 File.open("#{classname}.java","w") do |file|
120 120 source.each do |s|
121 121 file.puts s
122 122 end
123 123 end
124 124 #system("cp #{params[:source_file]} #{classname}.java")
125 - command = "#{JAVA_COMPILER} #{classname}.java 2> #{params[:message_file]}"
126 - system(command)
125 + command = "#{JAVA_COMPILER} #{classname}.java"
126 + system(command, err: params[:message_file])
127 127 if File.exists?(classname + ".class")
128 128 File.open(params[:output_file],"w") {|file| file.write("#{classname}")}
129 129 end
130 130 if classname == 'DUMMY'
131 131 File.open(params[:message_file],"w") {|file| file.write("Cannot find any public class in the source code\n")}
132 132 end
133 133
134 134 when "ruby"
135 - command = "#{RUBY_INTERPRETER} -c #{params[:source_file]} 2> #{params[:message_file]}"
136 - if system(command)
135 + command = "#{RUBY_INTERPRETER} -c #{params[:source_file]}"
136 + if system(command, err: params[:message_file])
137 137 File.open(params[:output_file],"w") do |out_file|
138 138 out_file.puts "#!#{RUBY_INTERPRETER}"
139 139 File.open(params[:source_file],"r").each do |line|
140 140 out_file.print line
141 141 end
142 142 end
143 143 File.chmod(0755, params[:output_file])
144 144 end
145 145
146 146 when "python"
147 - command = "#{PYTHON_CHECKER} #{params[:source_file]} > #{params[:message_file]}"
148 - if system(command)
147 + command = "#{PYTHON_CHECKER} #{params[:source_file]}"
148 + if system(command, out: params[:message_file])
149 149 #compile to python bytecode
150 150 command = "#{PYTHON_INTERPRETER} -m py_compile #{params[:source_file]}"
151 151 puts "compile: #{command}"
152 152 system(command)
153 153 puts "pwd: " + Dir.pwd
154 154 Dir.new('.').each {|file| puts file}
155 155 File.open(params[:output_file],"w") do |out_file|
156 156 out_file.puts "#!#{PYTHON_INTERPRETER} #{params[:source_file]}c"
157 157 end
158 158 File.chmod(0755, params[:output_file])
159 159 FileUtils.cp("#{params[:source_file]}c",params[:output_file])
160 160 end
161 161
162 162 when "php"
163 - command = "#{PHP_INTERPRETER} #{PHP_OPTIONS} #{params[:source_file]} 2> #{params[:message_file]}"
164 - if system(command)
163 + command = "#{PHP_INTERPRETER} #{PHP_OPTIONS} #{params[:source_file]}"
164 + if system(command, err: params[:message_file])
165 165 File.open(params[:output_file],"w") do |out_file|
166 166 out_file.puts "#!#{PHP_INTERPRETER}"
167 167 File.open(params[:source_file],"r").each do |line|
168 168 out_file.print line
169 169 end
170 170 end
171 171 File.chmod(0755, params[:output_file])
172 172 end
173 173
174 174 else
175 175 talk("ERROR: Invalid language specified!")
176 176 open(params[:message_file],"w") do |f|
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -95,40 +95,40
95 95 PYTHON_OPTION = "-p /usr/lib64/ -p /usr/local/lib64/ -p /usr/local/lib/ -p /usr/bin/ -p /lib64/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p #{sandbox_dir}/#{source_name} -s set_robust_list -s openat -s recvmsg -s connect -s socket -s sendto -s futex -E PYTHONNOUSERSITE=yes"
96 96 PHP_OPTION = "-p /usr/lib64/ -p/lib64/ -p /usr/bin/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p /usr/share/ -s setfsuid -s setfsgid -s openat -s set_robust_list -s futex -s clone -s socket -s connect"
97 97
98 98 case language
99 99 when "java"
100 100 # for java, extract the classname
101 101 # wne have to add additional systemcall and we don't check the mem limit (dunno how to fix...)
102 102 classname = 'DUMMY'
103 103 File.open(program_name,"r").each do |line|
104 104 classname = line
105 105 end
106 106 #for java, we cannot really check the memory limit...
107 - run_command = "#{problem_home}/script/box -a 3 -f -T -t #{time_limit} #{JAVA_OPTION} -i #{input_file_name} -o output.txt /usr/bin/java #{classname} 2>run_result"
107 + run_command = "#{problem_home}/script/box -a 3 -f -T -t #{time_limit} #{JAVA_OPTION} -i #{input_file_name} -o output.txt /usr/bin/java #{classname} "
108 108 when "ruby"
109 - run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{mem_limit} #{RUBY_OPTION} -i #{input_file_name} -o output.txt /usr/bin/ruby #{program_name} 2>run_result"
109 + run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{mem_limit} #{RUBY_OPTION} -i #{input_file_name} -o output.txt /usr/bin/ruby #{program_name} "
110 110 when "python"
111 - run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{mem_limit} #{PYTHON_OPTION} -i #{input_file_name} -o output.txt /usr/bin/python #{program_name} 2>run_result"
111 + run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{mem_limit} #{PYTHON_OPTION} -i #{input_file_name} -o output.txt /usr/bin/python #{program_name} "
112 112 when "php"
113 - run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} #{PHP_OPTION} -i #{input_file_name} -o output.txt /usr/bin/php #{program_name} 2>run_result"
113 + run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} #{PHP_OPTION} -i #{input_file_name} -o output.txt /usr/bin/php #{program_name} "
114 114 else # for c++, pascal, we do the normal checking
115 - run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit} -m #{mem_limit} -i #{input_file_name} -o output.txt #{program_name} 2>run_result"
115 + run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit} -m #{mem_limit} -i #{input_file_name} -o output.txt #{program_name} "
116 116 end
117 117
118 118
119 119 log "Running test #{test_num}..."
120 120 log run_command
121 121 log
122 - system(run_command)
122 + system(run_command,err: 'run_result')
123 123
124 124 # Restore PROBLEM_HOME
125 125 ENV['PROBLEM_HOME'] = problem_home
126 126
127 127 # Create the result file.
128 128 result_file = File.new("result", "w")
129 129 comment_file = File.new("comment", "w")
130 130
131 131 # Check if the program actually produced any output.
132 132 run_result_file = File.new("run_result", "r")
133 133 run_result = run_result_file.readlines
134 134 run_result_file.close
You need to be logged in to leave comments. Login now