cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

Commit `r147:9e3cee7d454d` public

parent | child

Description:

add more languages, java and ruby add bookmark algo-bm and branch algo

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r147:9e3cee7d454d - Sat, 09 Aug 2014 13:47:16 - 5 files changed: 54 inserted, 7 deleted

std-script/compile ¶ +29

@@ -26,10 +26,13
26	C_COMPILER = "/usr/bin/gcc"	26	C_COMPILER = "/usr/bin/gcc"
27	CPLUSPLUS_COMPILER = "/usr/bin/g++"	27	CPLUSPLUS_COMPILER = "/usr/bin/g++"
28	PASCAL_COMPILER = "/usr/bin/fpc"	28	PASCAL_COMPILER = "/usr/bin/fpc"
		29	+ JAVA_COMPILER = "/usr/bin/javac"
		30	+ RUBY_INTEPRETER = "/home/dae/.rvm/rubies/ruby-1.9.2-p320/bin/ruby"
29		31
30	C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall"	32	C_OPTIONS = "-O2 -s -static -std=c99 -DCONTEST -lm -Wall"
31	CPLUSPLUS_OPTIONS = "-O2 -s -static -DCONTEST -lm -Wall"	33	CPLUSPLUS_OPTIONS = "-O2 -s -static -DCONTEST -lm -Wall"
32	PASCAL_OPTIONS = "-O1 -XS -dCONTEST"	34	PASCAL_OPTIONS = "-O1 -XS -dCONTEST"
		35	+ JAVA_OPTIONS = ""
33		36
34	# Check for the correct number of arguments. Otherwise, print usage.	37	# Check for the correct number of arguments. Otherwise, print usage.
35	if ARGV.length == 0 or ARGV.length > 4	38	if ARGV.length == 0 or ARGV.length > 4
@@ -96,6 +99,32
96	command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS} > #{params[:message_file]}"	99	command = "#{PASCAL_COMPILER} #{params[:source_file]} -ooutpas #{PASCAL_OPTIONS} > #{params[:message_file]}"
97	system(command)	100	system(command)
98	FileUtils.mv("output", params[:output_file])	101	FileUtils.mv("output", params[:output_file])
		102	+
		103	+ when "java"
		104	+ #rename the file to the public class name
		105	+
		106	+ #get the class name
		107	+ classname = 'DUMMY'
		108	+ File.foreach(params[:source_file]) do \|line\|
		109	+ md = /\spublic\sclass\s(\w)/.match(line)
		110	+ classname=md[1] if md
		111	+ end
		112	+ system("cp #{params[:source_file]} #{classname}.java")
		113	+ command = "#{JAVA_COMPILER} #{classname}.java > #{params[:message_file]}"
		114	+ system(command)
		115	+ File.open(params[:output_file],"w") {\|file\| file.write("#!/bin/sh\n/usr/bin/java #{classname}\n")}
		116	+ File.chmod(0755, params[:output_file])
		117	+
		118	+ when "ruby"
		119	+ command = "#{RUBY_INTEPRETER} -c #{params[:source_file]} > #{params[:message_file]}"
		120	+ system(command)
		121	+ File.open(params[:output_file],"w") do \|out_file\|
		122	+ out_file.puts "#!#{RUBY_INTEPRETER}"
		123	+ File.open(params[:source_file],"r").each do \|line\|
		124	+ out_file.print line
		125	+ end
		126	+ end
		127	+ File.chmod(0755, params[:output_file])
99		128
100	else	129	else
101	talk("ERROR: Invalid language specified!")	130	talk("ERROR: Invalid language specified!")

std-script/judge ¶ +3 -1

               end
               language = ARGV[0]
-            - if language != "c" && language != "c++" && language != "pas"
+            + if language != "c" && language != "c++" && language != "pas" && language != "java" && language != "ruby"
                 log "You specified a language that is not supported: #{language}."
                 exit(127)
               end
               else
                 call_and_log("Cannot move the compiled program to #{test_result_dir}") {
                   FileUtils.mv("a.out",test_result_dir)
+            +     if language == "java" then Dir["*.class"].each { |file| FileUtils.mv(file,test_result_dir)} end
                 }
                 FileUtils.rm_rf("#{sandbox_dir}/.")
               end
                 call_and_log("Cannot copy the compiled program into #{sandbox_dir}") {
                   FileUtils.cp("#{test_result_dir}/a.out", sandbox_dir, :preserve => true)
+            +     if language == "java" then Dir["#{test_result_dir}/*.class"].each { |file| FileUtils.cp(file,sandbox_dir)} end
                 }
                 begin

std-script/run ¶ +20 -4

               end
               def extract_time(t)
-            -   #  puts "TIME: #{t}"
+            +   #puts "TIME: #{t}"
-            -   if (result=/^(.*)r(.*)u(.*)s/.match(t))
+            +   #if (result=/^(.*)real(.*)wall(.*)s/.match(t))
+            +   if (result=/^OK \((.*) sec real\, (.*) sec wall,.*MB, (.*) syscalls/.match(t))
                   {:real => result[1], :user => result[2], :sys => result[3]}
                 else
                   #{:real => 0, :user => 0, :sys => 0}
               # Run the program.
               #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}"
+            + #
-            - 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"
+            +
+            +
+            + case language
+            +   when "java"
+            +     # for java, we have to add additional systemcall and we don't check the mem limit (dunno how to fix...)
+            +     run_command = "#{problem_home}/script/box -T -t #{time_limit} -s getppid -s clone -s wait4 -p /usr/bin/ -p ./ -i #{input_file_name} -o output.txt #{program_name} 2>run_result"
+            +   when "ruby"
+            +     run_command = "#{problem_home}/script/box -T -t #{time_limit} -s getppid -s wait4 -s clone -s set_robust_list -s futex -s sigaltstack -p /dev/urandom -p ./ -p /home/dae/.rvm/rubies/ruby-1.9.2-p320/ -p #{problem_home}/ -i #{input_file_name} -o output.txt #{program_name} 2>run_result"
+            +   when "c++"
+            +     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"
+            +   else
+            +     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"
+            + end
+            +
               log "Running test #{test_num}..."
               log run_command
                 report.call(run_result[0], 0, "No comment.\n")
               end
-            - if running_time[:user].to_f + running_time[:sys].to_f > time_limit
+            + if running_time[:user].to_f > time_limit
                 log "Time limit exceeded."
                 report.call("Time limit exceeded", 0, "No comment.\n")
               end

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

-            - #!/usr/bin/ruby
+            + #!/usr/bin/env ruby
               problem_home = ENV['PROBLEM_HOME']
               require "#{problem_home}/script/test_dsl.rb"

test/data/test_request/problems/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"

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

r147:9e3cee7d454d - Sat, 09 Aug 2014 13:47:16 - 5 files changed: 54 inserted, 7 deleted

Sign in to your account

Commit r147:9e3cee7d454d public

Author

r147:9e3cee7d454d - Sat, 09 Aug 2014 13:47:16 - 5 files changed: 54 inserted, 7 deleted

Commit `r147:9e3cee7d454d` public