Fix checking of checker output (#65)

* Fix checking of checker output

* Bump version

* Add tests for this

Author: MasloMaslane

src/sinol_make/__init__.py

@@ -6,7 +6,7 @@
 
 from sinol_make import util
 
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 
 def configure_parsers():
     parser = argparse.ArgumentParser(

src/sinol_make/commands/run/__init__.py

@@ -366,10 +366,8 @@ def check_output_checker(self, name, input_file, output_file, answer_file):
                     pass
 
             return True, points
-        elif checker_output[0].strip() == "WRONG":
-            return False, 0
         else:
-            raise CheckerOutputException("Checker output is invalid.")
+            return False, 0
 
 
     def check_output(self, name, input_file, output_file_path, output, answer_file_path):

tests/packages/chk/prog/chkchk.cpp

@@ -2,18 +2,32 @@
 
 using namespace std;
 
+void print_wrong(char num, char letter) {
+    if (num == '1' && letter == 'a')
+        cout << "NOT OK" << endl;
+    else if (num == '2' && letter == 'a')
+        cout << "BAD" << endl;
+    else if (num == '2' && letter == 'b')
+        cout << "ABCDEF" << endl;
+    else
+        cout << "WRONG" << endl;
+}
+
 int main(int argc, char** argv) {
     assert(argc == 4);
     ifstream in(argv[1]);
     ifstream out(argv[2]);
     ifstream correct(argv[3]);
 
+    char num = argv[1][6];
+    char letter = argv[1][7];
+
     int ans, out_ans;
     correct >> ans;
     out >> out_ans;
 
     if (ans == -1 && out_ans != -1) {
-        cout << "WRONG" << endl;
+        print_wrong(num, letter);
         cout << "Expected -1, got " << out_ans << endl;
         return 0;
     }
@@ -27,7 +41,7 @@ int main(int argc, char** argv) {
     }
 
     if (out_ans > s) {
-        cout << "WRONG" << endl;
+        print_wrong(num, letter);
         cout << "Answer to big" << endl;
         return 0;
     }