cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

Commit `r214:336e928de90e` public

parent | child

Description:

update java-bm

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

r214:336e928de90e - Thu, 19 Feb 2015 15:48:36 - 9 files changed: 60 inserted, 21 deleted

installer/install.sh ¶ +32 -6

               #!/bin/sh
               echo "This script will install and configure Cafe grader."
-            - echo "This will install Ruby 1.9.2 under rvm"
+            + RUBY_VERSION=2.1.2
+            + echo "This will install Ruby $RUBY_VERSION under RVM"
               echo "Installing required apts"
               sudo apt-get update
               sudo apt-get install mysql-server mysql-client \
                 g++ gcc apache2 libmysqlclient15-dev build-essential \
                 git-core openssl libreadline6 libreadline6-dev \
                 zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-dev \
                 sqlite3 libxml2-dev libxslt-dev autoconf libc6-dev \
                 ncurses-dev automake libtool bison subversion \
-            -   pkg-config curl nodejs unzip
+            +   pkg-config curl nodejs unzip pyflakes ruby default-jdk
               echo "Installing RVM"
               curl -k -L https://get.rvm.io | bash -s stable
-            - ~/.rvm/scripts/rvm
+            + source ~/.rvm/scripts/rvm
-            - echo "Installing Ruby 1.9.2 in RVM"
+            + echo "Installing Ruby $RUBY_VERSION in RVM"
-            - rvm install 1.9.2
-            - rvm use 1.9.2
+            + rvm install $RUBY_VERSION
+            + rvm use $RUBY_VERSION
               echo "Fetching Cafe Grader from Git repositories"
               echo "Fetching web interface"
               mkdir cafe_grader
               echo "Configuring rails app"
               cp web/config/application.rb.SAMPLE web/config/application.rb
               cp web/config/initializers/cafe_grader_config.rb.SAMPLE web/config/initializers/cafe_grader_config.rb
+            + #replace UTC in application.rb with the system timezone
+            + timezone='UTC'
+            + if [ -f '/etc/timezone' ]; then
+            +   timezone=\"`cat /etc/timezone`\"
+            + else
+            +   if [ -f '/etc/sysconfig/clock' ]; then
+            +     timezone=`grep -e '^TIMEZONE' /etc/sysconfig/clock | grep -o -e '\".*\"'`
+            +   fi
+            + fi
+            + replace="s!'UTC'!$timezone!g"
+            + sed -i $replace web/config/application.rb
+            +
               echo "At this point we will need MySQL user and database."
               echo "Have you created MySQL user and database for Cafe grader? (Y/N) "
               read ch
               if [ "$ch" = "n" -o "$ch" = "N" ]
               then
               echo "Running rake tasks to initialize database"
               rake db:migrate
               rake db:seed
+            + echo "Running rake tasks to precompile the assets"
+            +
+            + rake assets:precompile
+            +
               echo "Intalling web interface complete..."
               echo
               echo "Fetching grader"
               cd ..
               # create new environment.rb file
               echo "RAILS_ROOT = '$CAFE_PATH/web'" > scripts/config/environment.rb
               echo "GRADER_ROOT = '$CAFE_PATH/judge/scripts'" >> scripts/config/environment.rb
               echo "require File.join(File.dirname(__FILE__),'../lib/boot')" >> scripts/config/environment.rb
               echo "require File.dirname(__FILE__) + \"/env_#{GRADER_ENV}.rb\"" >> scripts/config/environment.rb
+            + # compiling box
+            + MACHINE_TYPE=`uname -m`
+            + if [ ${MACHINE_TYPE} == 'x86_64' ]; then
+            +   gcc -std=c99 -o scripts/std-script/box scripts/std-script/box64-new.c
+            + else
+            +   g++ -o scripts/std-script/box scripts/std-script/box.cc
+            + fi
+            +
+            +
               cd ..
               echo "Now you are ready to run cafe grader...."
               echo
               echo "Try:"
               echo

new_problem ¶ +1 -1

-            - #!/usr/bin/ruby
+            + #!/usr/bin/env ruby
               # new_problem:
               #  * creates a directory for a problem in the current directory,
               #  * create standard testcase config file
               require 'erb'

std-script/box64-new.c ¶ +17 -4

               -t <time>\tSet run time limit (seconds, fractions allowed)\n\
               -T\t\tAllow syscalls for measuring run time\n\
               -v\t\tBe verbose (use multiple times for even more verbosity)\n\
               -w <time>\tSet wall clock time limit (seconds, fractions allowed)\n\
               -x <time>\tSet extra timeout, before which a timing-out program is not yet killed,\n\
               \t\tso that its real execution time is reported (seconds, fractions allowed)\n\
+            + -A <opt>\tPass <opt> as additional argument to the <command>\n\
+            + \t\tBe noted that this option will be appended after <arguments> respectively\n\
               ");
                 exit(2);
               }
               int
               main(int argc, char **argv)
               {
                 int c;
                 uid_t uid;
+            +   char **prog_argv = xmalloc(sizeof(char*) * argc);
+            +   int prog_argc = 0;
-            -   while ((c = getopt(argc, argv, "a:c:eE:fi:k:m:M:o:p:r:s:t:Tvw:x:")) >= 0)
+            +   while ((c = getopt(argc, argv, "a:c:eE:fi:k:m:M:o:p:r:s:t:Tvw:x:A:")) >= 0)
                   switch (c)
                     {
                     case 'a':
               	file_access = atol(optarg);
               	break;
                     case 'c':
               	break;
                     case 'w':
                       wall_timeout = 1000*atof(optarg);
               	break;
                     case 'x':
               	extra_timeout = 1000*atof(optarg);
+            +       case 'A':
+            +   prog_argv[prog_argc++] = strdup(optarg);
+            +   break;
               	break;
                     default:
               	usage();
                     }
                 if (optind >= argc)
                   usage();
                 uid = geteuid();
                 if (setreuid(uid, uid) < 0)
                   die("setreuid: %m");
                 box_pid = fork();
                 if (box_pid < 0)
                   die("fork: %m");
-            -   if (!box_pid)
-            -     box_inside(argc-optind, argv+optind);
-            -   else
+            +   if (!box_pid) {
+            +     int real_argc = prog_argc + argc - optind;
+            +     char **real_argv = xmalloc(sizeof(char*) * (real_argc));
+            +     for (int i = 0;i < argc-optind;i++)
+            +       real_argv[i] = strdup(argv[i+optind]);
+            +     for (int i = 0;i < prog_argc;i++)
+            +       real_argv[argc - optind + i] = strdup(prog_argv[i]);
+            +     box_inside(real_argc, real_argv);
+            +   } else
                   boxkeeper();
                 die("Internal error: fell over edge of the world");
               }

std-script/run ¶ +2 -2

                   # wne have to add additional systemcall and we don't check the mem limit (dunno how to fix...)
                   classname = 'DUMMY'
                   File.open(program_name,"r").each do |line|
                     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} "
+            +     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 -A -Xmx#{mem_limit}k -A #{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} "
                 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} "
                 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} "
+            +     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
                   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}..."

templates/check_wrapper ¶ +1 -1

-            - #!/usr/bin/ruby
+            + #!/usr/bin/env ruby
               #
               # This is a check script wrapper.  It read all required information
               # and call a real check script call REAL_CHECK_SCRIPT in directory
               # [problem_home]/script
               #

test/data/ev/test_memory/script/check ¶ +1 -1

-            - #!/usr/bin/ruby
+            + #!/usr/bin/env ruby
               problem_home = ENV['PROBLEM_HOME']
               require "#{problem_home}/script/test_dsl.rb"
               if ARGV.length < 2
                 puts "Usage: check <language> <test-number> [<output-file>]"

test/data/ev/test_normal/script/check ¶ +1 -1

-            - #!/usr/bin/ruby
+            + #!/usr/bin/env ruby
               problem_home = ENV['PROBLEM_HOME']
               require "#{problem_home}/script/test_dsl.rb"
               if ARGV.length < 2
                 puts "Usage: check <language> <test-number> [<output-file>]"

test/data/ev/test_timeout/script/check ¶ +1 -1

-            - #!/usr/bin/ruby
+            + #!/usr/bin/env ruby
               problem_home = ENV['PROBLEM_HOME']
               require "#{problem_home}/script/test_dsl.rb"
               if ARGV.length < 2
                 puts "Usage: check <language> <test-number> [<output-file>]"

test/engine_spec.rb ¶ +4 -4

                                 :and_report => {
                                   :graded_at= => nil,
                                   :compiler_message= => '',
                                   :grader_comment= => '',
                                   :running_stat= => /0.0\d* sec./,
                                   :output_file_name= => lambda { |fname|
-            -                       File.exists?(fname).should be_true
+            +                       File.exists?(fname).should be true
                                   },
                                   :running_time= => nil,
                                   :exit_status= => nil,
                                   :memory_usage= => nil,
                                   :save => nil})
                 end
                                   :running_stat= => nil,
                                   :output_file_name= => nil,
                                   :running_time= => nil,
                                   :exit_status= => nil,
                                   :memory_usage= => nil,
                                   :save => nil})
-            -     File.exists?(@config.user_result_dir + "/test_request/test_normal/test_cases/1/input-1.txt").should be_false
+            +     File.exists?(@config.user_result_dir + "/test_request/test_normal/test_cases/1/input-1.txt").should be false
                 end
                 it "should compile test request with error and report compilation error" do
                   problem = stub(Problem,
                                  :id => 1, :name => 'test_normal')
                   grader_should(:grade => 'test1_compile_error.c',
                                 :and_report => {
                                   :graded_at= => nil,
                                   :compiler_message= => '',
                                   :grader_comment= => '',
                                   :running_stat= => /[Ee]xit.*status.*10.*0\.0\d* sec/m,
                                   :output_file_name= => lambda { |fname|
-            -                       File.exists?(fname).should be_true
+            +                       File.exists?(fname).should be true
                                   },
                                   :running_time= => nil,
                                   :exit_status= => /10/,
                                   :memory_usage= => nil,
                                   :save => nil})
                 end
                                 :and_report => {
                                   :graded_at= => nil,
                                   :compiler_message= => '',
                                   :grader_comment= => '',
                                   :running_stat= => nil,
                                   :output_file_name= => lambda { |fname|
-            -                       File.exists?(fname).should be_true
+            +                       File.exists?(fname).should be true
                                   },
                                   :running_time= => lambda { |t|
                                     (t>=0.14) and (t<=0.16)
                                   },
                                   :exit_status= => nil,
                                   :memory_usage= => lambda { |s|

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

r214:336e928de90e - Thu, 19 Feb 2015 15:48:36 - 9 files changed: 60 inserted, 21 deleted

Sign in to your account

Commit r214:336e928de90e public

Author

r214:336e928de90e - Thu, 19 Feb 2015 15:48:36 - 9 files changed: 60 inserted, 21 deleted

Commit `r214:336e928de90e` public