cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

Commit `r179:9eed5e566314` public

parent | child

Description:

merge

Commit status:

[Not Reviewed]

References:

merge java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r179:9eed5e566314 - Mon, 29 Sep 2014 05:54:26 - 2 files changed: 20 inserted, 20 deleted

std-script/compile ¶ +14 -14

               case params[:prog_lang]
               when "c"
-            -   command = "#{C_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{C_OPTIONS} 2> #{params[:message_file]}"
+            +   command = "#{C_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{C_OPTIONS}"
-            -   system(command)
+            +   system(command, err: params[:message_file])
               when "c++"
-            -   command = "#{CPLUSPLUS_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{CPLUSPLUS_OPTIONS} 2> #{params[:message_file]}"
+            +   command = "#{CPLUSPLUS_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{CPLUSPLUS_OPTIONS}"
-            -   system(command)
+            +   system(command, err: params[:message_file])
               when "pas"
-            -   command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS} > #{params[:message_file]}"
+            +   command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS}"
-            -   system(command)
+            +   system(command,out: params[:message_file])
                 FileUtils.mv("output", params[:output_file])
               when "java"
                   end
                 end
                 #system("cp #{params[:source_file]} #{classname}.java")
-            -   command = "#{JAVA_COMPILER} #{classname}.java 2> #{params[:message_file]}"
+            +   command = "#{JAVA_COMPILER} #{classname}.java"
-            -   system(command)
+            +   system(command, err: params[:message_file])
                 if File.exists?(classname + ".class")
                   File.open(params[:output_file],"w") {|file| file.write("#{classname}")}
                 end
                 end
               when "ruby"
-            -   command = "#{RUBY_INTERPRETER} -c #{params[:source_file]} 2> #{params[:message_file]}"
+            +   command = "#{RUBY_INTERPRETER} -c #{params[:source_file]}"
-            -   if system(command)
+            +   if system(command, err: params[:message_file])
                   File.open(params[:output_file],"w") do |out_file|
                     out_file.puts "#!#{RUBY_INTERPRETER}"
                     File.open(params[:source_file],"r").each do |line|
                 end
               when "python"
-            -   command = "#{PYTHON_CHECKER} #{params[:source_file]} > #{params[:message_file]}"
+            +   command = "#{PYTHON_CHECKER} #{params[:source_file]}"
-            -   if system(command)
+            +   if system(command, out: params[:message_file])
                   #compile to python bytecode
                   command = "#{PYTHON_INTERPRETER} -m py_compile #{params[:source_file]}"
                   puts "compile: #{command}"
                 end
               when "php"
-            -   command = "#{PHP_INTERPRETER} #{PHP_OPTIONS} #{params[:source_file]} 2> #{params[:message_file]}"
+            +   command = "#{PHP_INTERPRETER} #{PHP_OPTIONS} #{params[:source_file]}"
-            -   if system(command)
+            +   if system(command, err: params[:message_file])
                   File.open(params[:output_file],"w") do |out_file|
                     out_file.puts "#!#{PHP_INTERPRETER}"
                     File.open(params[:source_file],"r").each do |line|

std-script/run ¶ +6 -6

                     classname = line
                   end
                   #for java, we cannot really check the memory limit...
-            -     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"
+            +     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} "
                 when "ruby"
-            -     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"
+            +     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} "
                 when "python"
-            -     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"
+            +     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} "
                 when "php"
-            -     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"
+            +     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} "
                 else # for c++, pascal, we do the normal checking
-            -     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"
+            +     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} "
               end
               log "Running test #{test_num}..."
               log run_command
               log
-            - system(run_command)
+            + system(run_command,err: 'run_result')
               # Restore PROBLEM_HOME
               ENV['PROBLEM_HOME'] = problem_home

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

r179:9eed5e566314 - Mon, 29 Sep 2014 05:54:26 - 2 files changed: 20 inserted, 20 deleted

Sign in to your account

Commit r179:9eed5e566314 public

Author

r179:9eed5e566314 - Mon, 29 Sep 2014 05:54:26 - 2 files changed: 20 inserted, 20 deleted

Commit `r179:9eed5e566314` public