Bugfix + undefined execute + keep + special override

Basic_System/ef/vpl_evaluate.pl

@@ -159,6 +159,11 @@ sub run_special($$$$) {
 
     if (ref($special) ne 'HASH') {
         $special = { content => $content };
+    } else {
+        my $given_test = $test;
+        $test = {};
+        add_values($test, $given_test);
+        add_values($test, $special);
     }
     # generate file if required and populate the 'files' array
     if (exists($special->{content})) {
@@ -189,8 +194,10 @@ sub run_special($$$$) {
     }
     my $result;
     if (exists($special->{execute})) {
-        setup_env($name, $special);
-        $result = run_special($test_name, '.execute', $special->{execute}, $test);
+        if ($special->{execute}) {
+            setup_env($name, $special);
+            $result = run_special($test_name, '.execute', $special->{execute}, $test);
+        }
     } else {
         debug("Executing $name\n");
         $result = run_command($test_name, "./$name", $test);
@@ -199,7 +206,7 @@ sub run_special($$$$) {
         }
     }
     if (exists($special->{content})) {
-        remove("$name") unless $special->{compiled};
+        remove("$name") unless $special->{compiled} or $special->{keep};
     }
     return $result;
 }
@@ -213,7 +220,7 @@ sub clean_outputs($$) {
 
     $level = 2 unless defined($level);
     foreach my $part ('output', 'error') {
-        if ($data->{$part} =~ m/Grade\s*:=>>/i) {
+        if ($data->{$part} && ($data->{$part} =~ m/Grade\s*:=>>/i)) {
             $data->{$part} = "Pathetic attempt to set the grade detected\n".
                 "Please stop trying to hack the system";
         }
@@ -315,22 +322,23 @@ sub perform_tests($$) {
                 my $answer = run_special($test_name, '.solution', $test->{solution}, $test);
                 if ($answer->{compilation_error}) {
                     dispatch_error("Cannot compile provided solution", $answer, 0);
-                }
-                clean_outputs($answer, $test);
-                my $match;
-                if (exists($test->{match})) {
-                    $match = $test->{match};
                 } else {
-                    $match = [ 'output' ];
-                }
-                foreach my $part ('output', 'error', 'code') {
-                    if (scalar(grep(/$part/, @$match))) {
-                        $test->{$part} = $answer->{$part};
+                    clean_outputs($answer, $test);
+                    my $match;
+                    if (exists($test->{match})) {
+                        $match = $test->{match};
                     } else {
-                        if ($part eq 'code') {
-                            debug("Solution $part :\n$answer->{$part}\n") if $answer->{$part};
+                        $match = [ 'output' ];
+                    }
+                    foreach my $part ('output', 'error', 'code') {
+                        if (scalar(grep(/$part/, @$match))) {
+                            $test->{$part} = $answer->{$part};
                         } else {
-                            debug("Solution $part :\n$answer->{$part}\n") if length($answer->{$part});
+                            if ($part eq 'code') {
+                                debug("Solution $part :\n$answer->{$part}\n") if $answer->{$part};
+                            } else {
+                                debug("Solution $part :\n$answer->{$part}\n") if length($answer->{$part});
+                            }
                         }
                     }
                 }