Support test patterns in 'gen' and 'invoke'

mirjalali · mirjalali · commit b044eef40b97 · 2019-05-24T19:23:31.000+04:30
diff --git a/scripts/gen.sh b/scripts/gen.sh
@@ -13,7 +13,8 @@ function usage {
 	errcho -e "  -s, --sensitive"
 	errcho -e "\tTerminates on the first error."
 	errcho -e "  -m, --model-solution=<model-solution-path>"
-	errcho -e "  -t, --test=<test-name>"
+	errcho -e "  -t, --test=<test-name-pattern>"
+	errcho -e "\tGenerates only tests matching the given pattern. Examples: 1-01, '1-*', '1-0?'"
 	errcho -e "  -d, --gen-data=<gen-data-file>"
 	errcho -e "      --no-gen"
 	errcho -e "      --no-sol"
@@ -25,8 +26,8 @@ function usage {
 model_solution=""
 gen_data_file="${GEN_DIR}/data"
 SENSITIVE_RUN="false"
-SINGULAR_TEST="false"
-SOLE_TEST_NAME=""
+SPECIFIC_TESTS="false"
+SPECIFIED_TESTS_PATTERN=""
 SKIP_GEN="false"
 SKIP_SOL="false"
 SKIP_VAL="false"
@@ -40,8 +41,8 @@ function handle_option {
             exit 0
             ;;
         -t|--test=*)
-            fetch_arg_value "SOLE_TEST_NAME" "-t" "--test" "test name"
-            SINGULAR_TEST="true"
+            fetch_arg_value "SPECIFIED_TESTS_PATTERN" "-t" "--test" "test name"
+            SPECIFIC_TESTS="true"
             ;;
         -m|--model-solution=*)
             fetch_arg_value "model_solution" "-m" "--model-solution" "solution path"
@@ -88,7 +89,7 @@ sensitive check_file_exists "Generation data file" "${gen_data_file}"
 
 command_exists dos2unix || cecho yellow "WARNING: dos2unix is not available. Line endings might be incorrect."
 
-export SENSITIVE_RUN SINGULAR_TEST SOLE_TEST_NAME SKIP_GEN SKIP_SOL SKIP_VAL
+export SENSITIVE_RUN SPECIFIC_TESTS SPECIFIED_TESTS_PATTERN SKIP_GEN SKIP_SOL SKIP_VAL
 
 
 recreate_dir "${LOGS_DIR}"
diff --git a/scripts/internal/gen.py b/scripts/internal/gen.py
@@ -1,15 +1,15 @@
 import os
 import sys
 from collections import defaultdict
-from gen_data_parser import DataVisitor, parse_data, data_parse_error, check_test_exists
+from gen_data_parser import DataVisitor, parse_data, data_parse_error, check_test_pattern_exists, test_name_matches_pattern
 from util import load_json, run_bash_command
 
 
 PROBLEM_JSON = os.environ.get('PROBLEM_JSON')
 SUBTASKS_JSON = os.environ.get('SUBTASKS_JSON')
 INTERNALS_DIR = os.environ.get('INTERNALS')
-SINGULAR_TEST = os.environ.get('SINGULAR_TEST')
-SOLE_TEST_NAME = os.environ.get('SOLE_TEST_NAME')
+SPECIFIC_TESTS = os.environ.get('SPECIFIC_TESTS')
+SPECIFIED_TESTS_PATTERN = os.environ.get('SPECIFIED_TESTS_PATTERN')
 
 
 class SummaryVisitor(DataVisitor):
@@ -61,7 +61,7 @@ def print_mapping(self, stream):
 
 class GeneratingVisitor(DataVisitor):
     def on_test(self, testset_name, test_name, line, line_number):
-        if SINGULAR_TEST == "false" or test_name == SOLE_TEST_NAME:
+        if SPECIFIC_TESTS == "false" or test_name_matches_pattern(test_name, SPECIFIED_TESTS_PATTERN):
             command = [
                 'bash',
                 os.path.join(INTERNALS_DIR, 'gen_test.sh'),
@@ -75,8 +75,8 @@ def on_test(self, testset_name, test_name, line, line_number):
     task_data = load_json(PROBLEM_JSON)
     gen_data = sys.stdin.readlines()
 
-    if SINGULAR_TEST == "true":
-        check_test_exists(gen_data, task_data, SOLE_TEST_NAME)
+    if SPECIFIC_TESTS == "true":
+        check_test_pattern_exists(gen_data, task_data, SPECIFIED_TESTS_PATTERN)
 
     summary_visitor = SummaryVisitor()
     parse_data(gen_data, task_data, summary_visitor)
diff --git a/scripts/internal/gen_data_parser.py b/scripts/internal/gen_data_parser.py
@@ -1,5 +1,6 @@
 import os
 import sys
+import fnmatch
 from test_name import get_test_name
 
 line_number = 0
@@ -113,3 +114,18 @@ def check_test_exists(gen_data, task_data, test_name):
     if not tests_visitor.has_test(test_name):
         sys.stderr.write("Invalid test name '%s'\n" % test_name)
         exit(2)
+
+
+
+def test_name_matches_pattern(test_name, pattern):
+    return fnmatch.fnmatchcase(test_name, pattern)
+
+
+
+def check_test_pattern_exists(gen_data, task_data, test_pattern):
+    tests_visitor = TestsVisitor()
+    parse_data(gen_data, task_data, tests_visitor)
+    if not [test_name for test_name in tests_visitor.tests if test_name_matches_pattern(test_name, test_pattern)]:
+        sys.stderr.write("No test name matches the pattern '%s'\n" % test_pattern)
+        exit(2)
+
diff --git a/scripts/internal/invoke.py b/scripts/internal/invoke.py
@@ -1,19 +1,19 @@
 import os
 import sys
 
-from gen_data_parser import DataVisitor, parse_data, check_test_exists
+from gen_data_parser import DataVisitor, parse_data, check_test_pattern_exists, test_name_matches_pattern
 from util import load_json, run_bash_command
 
 
 PROBLEM_JSON = os.environ.get('PROBLEM_JSON')
 INTERNALS_DIR = os.environ.get('INTERNALS')
-SINGULAR_TEST = os.environ.get('SINGULAR_TEST')
-SOLE_TEST_NAME = os.environ.get('SOLE_TEST_NAME')
+SPECIFIC_TESTS = os.environ.get('SPECIFIC_TESTS')
+SPECIFIED_TESTS_PATTERN = os.environ.get('SPECIFIED_TESTS_PATTERN')
 
 
 class InvokingVisitor(DataVisitor):
     def on_test(self, testset_name, test_name, line, line_number):
-        if SINGULAR_TEST == "false" or test_name == SOLE_TEST_NAME:
+        if SPECIFIC_TESTS == "false" or test_name_matches_pattern(test_name, SPECIFIED_TESTS_PATTERN):
             command = [
                 'bash',
                 os.path.join(INTERNALS_DIR, 'invoke_test.sh'),
@@ -25,7 +25,7 @@ def on_test(self, testset_name, test_name, line, line_number):
     task_data = load_json(PROBLEM_JSON)
     gen_data = sys.stdin.readlines()
 
-    if SINGULAR_TEST == "true":
-        check_test_exists(gen_data, task_data, SOLE_TEST_NAME)
+    if SPECIFIC_TESTS == "true":
+        check_test_pattern_exists(gen_data, task_data, SPECIFIED_TESTS_PATTERN)
 
     parse_data(gen_data, task_data, InvokingVisitor())
diff --git a/scripts/invoke.sh b/scripts/invoke.sh
@@ -14,7 +14,8 @@ function usage {
 	errcho -e "\tTerminates on the first error."
 	errcho -e "  -r, --show-reason"
 	errcho -e "\tDisplays the reason for not being accepted, e.g. checker output"
-	errcho -e "  -t, --test=<test-name>"
+	errcho -e "  -t, --test=<test-name-pattern>"
+	errcho -e "\tInvokes only tests matching the given pattern. Examples: 1-01, '1-*', '1-0?'"
 	errcho -e "  -d, --gen-data=<gen-data-file>"
 	errcho -e "      --no-check"
 	errcho -e "      --no-sol-compile"
@@ -30,8 +31,8 @@ function usage {
 gen_data_file="${GEN_DIR}/data"
 SHOW_REASON="false"
 SENSITIVE_RUN="false"
-SINGULAR_TEST="false"
-SOLE_TEST_NAME=""
+SPECIFIC_TESTS="false"
+SPECIFIED_TESTS_PATTERN=""
 SKIP_CHECK="false"
 skip_compile_sol="false"
 
@@ -44,8 +45,8 @@ function handle_option {
             exit 0
             ;;
         -t|--test=*)
-            fetch_arg_value "SOLE_TEST_NAME" "-t" "--test" "test name"
-            SINGULAR_TEST="true"
+            fetch_arg_value "SPECIFIED_TESTS_PATTERN" "-t" "--test" "test name"
+            SPECIFIC_TESTS="true"
             ;;
         -s|--sensitive)
             SENSITIVE_RUN="true"
@@ -123,7 +124,7 @@ sensitive check_file_exists "Solution file" "${solution}"
 
 sensitive check_file_exists "Generation data file" "${gen_data_file}"
 
-export SHOW_REASON SENSITIVE_RUN SINGULAR_TEST SOLE_TEST_NAME SKIP_CHECK SOFT_TL HARD_TL
+export SHOW_REASON SENSITIVE_RUN SPECIFIC_TESTS SPECIFIED_TESTS_PATTERN SKIP_CHECK SOFT_TL HARD_TL
 
 
 recreate_dir "${LOGS_DIR}"
