Merge pull request #3 from stanislaw/develop

CHECK-NOT command: more tests

src/FileCheck.py

@@ -198,7 +198,8 @@ def dump_check(check):
         exit(1)
 
 if current_check.check_type == CheckType.CHECK_NOT:
-    if current_check.match_type == MatchType.SUBSTRING:
+    if (current_check.match_type == MatchType.SUBSTRING or
+            current_check.match_type == MatchType.REGEX):
         print("{}:{}:{}: error: CHECK-NOT: excluded string found in input"
               .format(check_file, line_counter, current_check.start_index + 1))
 
@@ -209,5 +210,4 @@ def dump_check(check):
         print("^".ljust(len(current_line), '~'))
         exit(1)
 
-    if current_check.match_type == MatchType.REGEX:
-        assert 0, "Not implemented"
+    assert 0, "Not implemented"

tests/integration/tests/basic_functionality/check_commands/CHECK-NOT/one_string/02-positive_match/filecheck.check

@@ -0,0 +1 @@
+; CHECK-NOT: hello

tests/integration/tests/basic_functionality/check_commands/CHECK-NOT/one_string/02-positive_match/filecheck.input

@@ -0,0 +1 @@
+foo

tests/integration/tests/basic_functionality/check_commands/CHECK-NOT/one_string/02-positive_match/sample.itest

@@ -0,0 +1,3 @@
+; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1; test $? == 0;) | %FILECHECK_TESTER_EXEC %s
+; CHECK: {{^.*}}FileCheck
+; CHECK-EMPTY:

tests/integration/tests/basic_functionality/check_commands/CHECK-NOT/one_string/03-negative_match_regex/filecheck.check

@@ -0,0 +1 @@
+; CHECK-NOT: {{^h.l.o$}}

tests/integration/tests/basic_functionality/check_commands/CHECK-NOT/one_string/03-negative_match_regex/filecheck.input

@@ -0,0 +1 @@
+hello

tests/integration/tests/basic_functionality/check_commands/CHECK-NOT/one_string/03-negative_match_regex/sample.itest

@@ -0,0 +1,12 @@
+; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1; test $? == 1;) | %FILECHECK_TESTER_EXEC %s
+; CHECK: {{^.*}}FileCheck
+; CHECK-NEXT: {{^.*}}filecheck.check:1:14: error: CHECK-NOT: excluded string found in input{{$}}
+; TODO: Here we could do a better match.
+; CHECK-NEXT: {{^; CHECK-NOT: ...h.l.o...$}}
+; TODO: Real FileCheck ignores whitespaces even when regex is passed.
+; TODO: The next step is to check the --strict-whitespace option.
+; CHECK-NEXT: {{^ \^$}}
+; CHECK-NEXT: {{^<stdin>:.*:.*: note: found here$}}
+; CHECK-NEXT: {{^}}hello{{$}}
+; CHECK-NEXT: {{^}}^~~~~{{$}}
+; CHECK-EMPTY:

tests/integration/tests/basic_functionality/check_commands/CHECK-NOT/one_string/04-positive_match_regex/filecheck.check

@@ -0,0 +1 @@
+; CHECK-NOT: {{hello}}

tests/integration/tests/basic_functionality/check_commands/CHECK-NOT/one_string/04-positive_match_regex/filecheck.input

@@ -0,0 +1 @@
+foo

tests/integration/tests/basic_functionality/check_commands/CHECK-NOT/one_string/04-positive_match_regex/sample.itest

@@ -0,0 +1,3 @@
+; RUN: cat %S/filecheck.input | (%FILECHECK_EXEC %S/filecheck.check 2>&1; test $? == 0;) | %FILECHECK_TESTER_EXEC %s
+; CHECK: {{^.*}}FileCheck
+; CHECK-EMPTY: