Description:
merge
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r168:c9a21e293d3e - - 2 files changed: 10 inserted, 3 deleted
@@ -89,53 +89,60 | |||
|
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 | 96 | command = "#{C_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{C_OPTIONS} 2> #{params[:message_file]}" |
|
97 | 97 | system(command) |
|
98 | 98 | |
|
99 | 99 | when "c++" |
|
100 | 100 | command = "#{CPLUSPLUS_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{CPLUSPLUS_OPTIONS} 2> #{params[:message_file]}" |
|
101 | 101 | system(command) |
|
102 | 102 | |
|
103 | 103 | when "pas" |
|
104 | 104 | command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS} > #{params[:message_file]}" |
|
105 | 105 | system(command) |
|
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 | + source = Array.new | |
|
113 | 114 | File.foreach(params[:source_file]) do |line| |
|
114 | 115 | md = /\s*public\s*class\s*(\w*)/.match(line) |
|
115 | 116 | classname=md[1] if md |
|
117 | + source << line unless line =~ /\s*package\s*\w+\s*\;/ | |
|
116 | 118 | end |
|
117 | - system("cp #{params[:source_file]} #{classname}.java") | |
|
119 | + File.open("#{classname}.java","w") do |file| | |
|
120 | + source.each do |s| | |
|
121 | + file.puts s | |
|
122 | + end | |
|
123 | + end | |
|
124 | + #system("cp #{params[:source_file]} #{classname}.java") | |
|
118 | 125 | command = "#{JAVA_COMPILER} #{classname}.java 2> #{params[:message_file]}" |
|
119 | 126 | system(command) |
|
120 | 127 | if File.exists?(classname + ".class") |
|
121 | 128 | File.open(params[:output_file],"w") {|file| file.write("#{classname}")} |
|
122 | 129 | end |
|
123 | 130 | if classname == 'DUMMY' |
|
124 | 131 | File.open(params[:message_file],"w") {|file| file.write("Cannot find any public class in the source code\n")} |
|
125 | 132 | end |
|
126 | 133 | |
|
127 | 134 | when "ruby" |
|
128 | 135 | command = "#{RUBY_INTERPRETER} -c #{params[:source_file]} 2> #{params[:message_file]}" |
|
129 | 136 | if system(command) |
|
130 | 137 | File.open(params[:output_file],"w") do |out_file| |
|
131 | 138 | out_file.puts "#!#{RUBY_INTERPRETER}" |
|
132 | 139 | File.open(params[:source_file],"r").each do |line| |
|
133 | 140 | out_file.print line |
|
134 | 141 | end |
|
135 | 142 | end |
|
136 | 143 | File.chmod(0755, params[:output_file]) |
|
137 | 144 | end |
|
138 | 145 | |
|
139 | 146 | when "python" |
|
140 | 147 | command = "#{PYTHON_CHECKER} #{params[:source_file]} > #{params[:message_file]}" |
|
141 | 148 | if system(command) |
@@ -70,50 +70,50 | |||
|
70 | 70 | ##################################### |
|
71 | 71 | |
|
72 | 72 | time_limit = problem.get_time_limit test_num |
|
73 | 73 | mem_limit = problem.get_mem_limit(test_num) * 1024 |
|
74 | 74 | |
|
75 | 75 | # Copy the input file. |
|
76 | 76 | #`cp #{problem_home}/test_cases/#{test_num}/#{input_file_name} .` |
|
77 | 77 | |
|
78 | 78 | # check if box is there, if not, compile it! |
|
79 | 79 | if !File.exists?("#{problem_home}/script/box") |
|
80 | 80 | log "WARNING: Compiling box: to increase efficiency, it should be compile manually" |
|
81 | 81 | compile_box("#{problem_home}/script/box.cc", |
|
82 | 82 | "#{problem_home}/script/box") |
|
83 | 83 | end |
|
84 | 84 | |
|
85 | 85 | # Hide PROBLEM_HOME |
|
86 | 86 | ENV['PROBLEM_HOME'] = nil |
|
87 | 87 | ENV['SOURCE_NAME'] = nil |
|
88 | 88 | |
|
89 | 89 | # Run the program. |
|
90 | 90 | #run_command = "/usr/bin/time -f \"#{time_output_format}\" 2>run_result #{problem_home}/script/box_new -a 2 -f -t #{time_limit} -m #{mem_limit} -i #{input_file_name} -o output.txt #{program_name}" |
|
91 | 91 | # |
|
92 | 92 | |
|
93 | 93 | JAVA_OPTION = "-s set_robust_list -s futex -s clone -s getppid -s clone -s wait4 -p /usr/bin/ -p ./" |
|
94 | - RUBY_OPTION = "-p /usr/lib64/ -p /lib64/ -p /dev/urandom -p #{sandbox_dir}/#{program_name} -s set_robust_list -s sched_getaffinity -s clock_gettime -s sigaltstack -s pipe2 -s clone -s futex -s openat" | |
|
95 | - PYTHON_OPTION = "-p /usr/lib64/ -p /lib64/ -p /usr/bin/ -p /usr/local/lib64/ -p /usr/local/lib/ -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 -E PYTHONNOUSERSITE=yes" | |
|
94 | + RUBY_OPTION = "-p /usr/lib64/ -p /usr/local/lib/ -p /lib64/ -p /dev/urandom -p #{sandbox_dir}/#{program_name} -p #{sandbox_dir}/ -s set_robust_list -s sched_getaffinity -s clock_gettime -s sigaltstack -s pipe2 -s clone -s futex -s openat -s pipe" | |
|
95 | + PYTHON_OPTION = "-p /usr/lib64/ -p /lib64/ -p /usr/bin/ -p /usr/local/lib64/ -p /usr/local/lib/ -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 " |
|
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 | 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" |
|
108 | 108 | when "ruby" |
|
109 | 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" |
|
110 | 110 | when "python" |
|
111 | 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" |
|
112 | 112 | when "php" |
|
113 | 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" |
|
114 | 114 | else # for c++, pascal, we do the normal checking |
|
115 | 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" |
|
116 | 116 | end |
|
117 | 117 | |
|
118 | 118 | |
|
119 | 119 | log "Running test #{test_num}..." |
You need to be logged in to leave comments.
Login now