OSCL/cl-ppcre
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix spurious test failures

Browse Source
This commit is contained in:
Hans Huebner
2014-01-05 20:40:34 +01:00
parent 0bb107db3a
commit db6665e888
3 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
test/perl-tests.lisp
View File

@ -34,7 +34,7 @@
(in-package :cl-ppcre-test) (in-package :cl-ppcre-test)
(defvar *tests-to-skip* '(662 790 1439) (defvar *tests-to-skip* '(636 638 662 790 1439)
"Some tests we skip because the testdata is generated by a Perl "Some tests we skip because the testdata is generated by a Perl
program and CL-PPCRE differs from Perl for these tests - on purpose.") program and CL-PPCRE differs from Perl for these tests - on purpose.")
@ -104,20 +104,20 @@ test files."
(unless (find counter *tests-to-skip* :test #'=) (unless (find counter *tests-to-skip* :test #'=)
(when verbose (when verbose
(format t "~&~4D: ~S" counter info-string)) (format t "~&~4D: ~S" counter info-string))
(let ((scanner (block inner-test-block
(handler-bind ((error (lambda (condition) (let ((scanner
(declare (ignore condition)) (handler-bind ((error (lambda (condition)
(when perl-error (declare (ignore condition))
;; we expected an (when perl-error
;; error, so we can ;; we expected an
;; signal success ;; error, so we can
(return-from test-block))))) ;; signal success
(create-scanner regex (return-from inner-test-block)))))
:case-insensitive-mode case-insensitive-mode (create-scanner regex
:multi-line-mode multi-line-mode :case-insensitive-mode case-insensitive-mode
:single-line-mode single-line-mode :multi-line-mode multi-line-mode
:extended-mode extended-mode)))) :single-line-mode single-line-mode
(block test-block :extended-mode extended-mode))))
(multiple-value-bind (start end reg-starts reg-ends) (multiple-value-bind (start end reg-starts reg-ends)
(scan scanner target) (scan scanner target)
(cond (perl-error (cond (perl-error

4
test/perltestdata
View File

@ -14286,3 +14286,7 @@ b" nil "b" (nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil))
." nil nil nil nil "aa" nil nil nil) ." nil nil nil nil "aa" nil nil nil)
(1623 "\"abcdxklqj\" =~ /ab(?=.*q)cd/" "ab(?=.*q)cd" nil nil nil nil "abcdxklqj" nil "abcd" (nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil)) (1623 "\"abcdxklqj\" =~ /ab(?=.*q)cd/" "ab(?=.*q)cd" nil nil nil nil "abcdxklqj" nil "abcd" (nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil))
(1624 "\"ab\" =~ /a(?!.*$)b/" "a(?!.*$)b" nil nil nil nil "ab" nil nil nil) (1624 "\"ab\" =~ /a(?!.*$)b/" "a(?!.*$)b" nil nil nil nil "ab" nil nil nil)
(1625 "\"Axi\" =~ /.{2}[a-z]/" ".{2}[a-z]" nil nil nil nil "Axi" nil "Axi" (nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil))
(1626 "\"aaaaaaaaaac\" =~ /((a{0,5}){0,5}){0,5}c/" "((a{0,5}){0,5}){0,5}c" nil nil nil nil "aaaaaaaaaac" nil "aaaaaaaaaac" ("" "" nil nil nil nil nil nil nil nil nil nil nil nil nil nil))
(1627 "\"aaaaaaaaaa\" =~ /((a{0,5}){0,5}){0,5}c/" "((a{0,5}){0,5}){0,5}c" nil nil nil nil "aaaaaaaaaa" nil nil nil)
(1628 "\"aaaaaaaaaac\" =~ /((a{0,5}){0,5})*c/" "((a{0,5}){0,5})*c" nil nil nil nil "aaaaaaaaaac" nil "aaaaaaaaaac" ("" "" nil nil nil nil nil nil nil nil nil nil nil nil nil nil))

10
test/perltestinput
View File

@ -3945,4 +3945,12 @@
/a(?!.*$)b/ /a(?!.*$)b/
ab ab
/.{2}[a-z]/ /.{2}[a-z]/
Axi
/((a{0,5}){0,5}){0,5}c/
aaaaaaaaaac
aaaaaaaaaa
/((a{0,5}){0,5})*c/
aaaaaaaaaac