cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

Commit `r230:791a8b27f2e4` public

parent | child

Description:

merge

Commit status:

[Not Reviewed]

References:

merge default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r230:791a8b27f2e4 - Thu, 05 Jan 2017 05:46:10 - 3 files changed: 23 inserted, 12 deleted

std-script/compile ¶ +18 -10

               PYTHON_INTERPRETER = "/usr/bin/python3"
               PYTHON_CHECKER = "/usr/bin/pyflakes"
               PHP_INTERPRETER = "/usr/bin/php"
+            + HASKELL_COMPILER = "/usr/bin/ghc"
               C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall"
               CPLUSPLUS_OPTIONS = "-O2 -s -std=c++11 -static -DCONTEST -lm -Wall"
               JAVA_OPTIONS = ""
               PYTHON_OPTIONS = ""
               PHP_OPTIONS = "-l"
+            + HASKELL_OPTIONS = ""
               # Check for the correct number of arguments. Otherwise, print usage.
               if ARGV.length == 0 or ARGV.length > 4
                 end
               when "python"
-            -   command = "#{PYTHON_CHECKER} #{params[:source_file]}"
-            -   if system(command, out: params[:message_file])
+            +   #command = "#{PYTHON_CHECKER} #{params[:source_file]}"
+            +   #if system(command, out: params[:message_file])
                   #compile to python bytecode
                   command = "#{PYTHON_INTERPRETER} -c \"import py_compile; py_compile.compile('#{params[:source_file]}','#{params[:source_file]}c');\""
                   puts "compile: #{command}"
-            -     system(command)
-            -     puts "pwd: " + Dir.pwd
-            -     Dir.new('.').each {|file| puts file}
-            -     File.open(params[:output_file],"w") do |out_file|
-            -       out_file.puts "#!#{PYTHON_INTERPRETER} #{params[:source_file]}c"
+            +     system(command, err: params[:message_file])
+            +     if FileTest.exists?("#{params[:source_file]}c")
+            +       puts "pwd: " + Dir.pwd
+            +       Dir.new('.').each {|file| puts file}
+            +       File.open(params[:output_file],"w") do |out_file|
+            +         out_file.puts "#!#{PYTHON_INTERPRETER} #{params[:source_file]}c"
+            +       end
+            +       File.chmod(0755, params[:output_file])
+            +       FileUtils.cp("#{params[:source_file]}c",params[:output_file])
                   end
-            -     File.chmod(0755, params[:output_file])
-            -     FileUtils.cp("#{params[:source_file]}c",params[:output_file])
-            -   end
+            +   #end
               when "php"
                 command = "#{PHP_INTERPRETER} #{PHP_OPTIONS} #{params[:source_file]}"
                   File.chmod(0755, params[:output_file])
                 end
+            + when "haskell"
+            +   command = "#{HASKELL_COMPILER} #{params[:source_file]} -o #{params[:output_file]} #{HASKELL_OPTIONS}"
+            +   system(command, err: params[:message_file])
+            +
               else
                 talk("ERROR: Invalid language specified!")
                 open(params[:message_file],"w") do |f|

std-script/judge ¶ +1 -1

               end
               language = ARGV[0]
-            - if language != "c" && language != "c++" && language != "pas" && language != "java" && language != "ruby" && language != "python" && language != "php"
+            + if language != "c" && language != "c++" && language != "pas" && language != "java" && language != "ruby" && language != "python" && language != "php" && language != "haskell"
                 log "You specified a language that is not supported: #{language}."
                 exit(127)
               end

std-script/run ¶ +4 -1

               JAVA_OPTION = "-s set_robust_list -s futex -s clone -s getppid -s clone -s wait4 -p /usr/bin/ -p ./"
               RUBY_OPTION   = "-p /usr/lib64/ -p /usr/local/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"
-            - PYTHON_OPTION = "-p /usr/lib64/ -p /usr/local/lib64/ -p /usr/local/lib/ -p /usr/bin/ -p /lib64/ -p /dev/urandom -p /usr/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p #{sandbox_dir}/#{source_name} -p /proc/mounts -s statfs -s set_robust_list -s openat -s recvmsg -s connect -s socket -s sendto -s futex -s sigaltstack -E PYTHONNOUSERSITE=yes"
+            + PYTHON_OPTION = "-p /usr/lib64/ -p /usr/local/lib64/ -p /usr/local/lib/ -p /usr/bin/ -p /lib64/ -p /dev/urandom -p /usr/ -p #{sandbox_dir}/#{program_name} -p ./#{program_name} -p #{sandbox_dir}/#{source_name} -p /proc/sys/crypto/fips_enabled -p /proc/self/status -p /proc/mounts -p /var/lib/dpkg/status -s statfs -s set_robust_list -s openat -s sysinfo -s recvmsg -s connect -s socket -s sendto -s futex -s sigaltstack -s getrandom -E PYTHONNOUSERSITE=yes"
               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"
+            + HASKELL_OPTION = "-s set_robust_list -s clock_gettime -s sysinfo -s timer_create -s timer_settime -s futex -s timer_delete"
               case language
                 when "java"
                   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 #{[128 * 1024,mem_limit].max} #{PYTHON_OPTION} -i #{input_file_name} -o output.txt /usr/bin/python3 #{program_name} "
+            +   when "haskell"
+            +     run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit} -m #{[512 * 1024,mem_limit].max} #{HASKELL_OPTION} -i #{input_file_name} -o output.txt #{program_name} "
                 when "php"
                   run_command = "#{problem_home}/script/box -a 2 -f -T -t #{time_limit*=2} -m #{[128 * 1024,mem_limit].max} #{PHP_OPTION} -i #{input_file_name} -o output.txt /usr/bin/php -A -d -A memory_limit=#{mem_limit}k -A #{program_name} "
                 else # for c++, pascal, we do the normal checking

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

r230:791a8b27f2e4 - Thu, 05 Jan 2017 05:46:10 - 3 files changed: 23 inserted, 12 deleted

Sign in to your account

Commit r230:791a8b27f2e4 public

Author

r230:791a8b27f2e4 - Thu, 05 Jan 2017 05:46:10 - 3 files changed: 23 inserted, 12 deleted

Commit `r230:791a8b27f2e4` public