regexp: fix TestOnePassCutoff
The stack blowout can no longer happen,
but we can still test that too-complex regexps
are rejected.
Replacement for CL 162770043.
LGTM=iant, r
R=r, iant
CC=bradfitz, golang-codereviews
https://golang.org/cl/162860043
diff --git a/src/regexp/all_test.go b/src/regexp/all_test.go
index 5fadb67..01ea374 100644
--- a/src/regexp/all_test.go
+++ b/src/regexp/all_test.go
@@ -6,6 +6,7 @@
import (
"reflect"
+ "regexp/syntax"
"strings"
"testing"
)
@@ -473,12 +474,19 @@
}
}
-// This ran out of stack before issue 7608 was fixed.
+// Check that one-pass cutoff does trigger.
func TestOnePassCutoff(t *testing.T) {
- if testing.Short() {
- t.Skip("Skipping in short mode")
+ re, err := syntax.Parse(`^x{1,1000}y{1,1000}$`, syntax.Perl)
+ if err != nil {
+ t.Fatalf("parse: %v", err)
}
- MustCompile(`^(?:x{1,1000}){1,1000}$`)
+ p, err := syntax.Compile(re.Simplify())
+ if err != nil {
+ t.Fatalf("compile: %v", err)
+ }
+ if compileOnePass(p) != notOnePass {
+ t.Fatalf("makeOnePass succeeded; wanted notOnePass")
+ }
}
func BenchmarkLiteral(b *testing.B) {
