equal
deleted
inserted
replaced
19 |
19 |
20 # marks for CW7 part 1 |
20 # marks for CW7 part 1 |
21 marks=$(( 0 )) |
21 marks=$(( 0 )) |
22 |
22 |
23 |
23 |
24 # compilation tests |
24 # compilation tests (used to be 30 secs) |
25 |
25 |
26 function scala_compile { |
26 function scala_compile { |
27 (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala "$1" 2> /dev/null 1> /dev/null) |
27 (ulimit -t 360; JAVA_OPTS="-Xmx1g" scala "$1" 2> /dev/null 1> /dev/null) |
28 } |
28 } |
29 |
29 |
30 # functional tests |
30 # functional tests |
31 |
31 |
32 function scala_assert { |
32 function scala_assert { |