merge conflict

This commit is contained in:
gobwas 2016-02-24 23:36:26 +03:00
commit f910d4c1c7
1 changed files with 9 additions and 0 deletions

View File

@ -193,6 +193,15 @@ func BenchmarkAllGlobMismatch(b *testing.B) {
_ = m.Match(fixture_all_mismatch) _ = m.Match(fixture_all_mismatch)
} }
} }
func BenchmarkAllGlobMatchParallel(b *testing.B) {
m, _ := Compile(pattern_all)
b.RunParallel(func(pb *testing.PB) {
for pb.Next() {
_ = m.Match(fixture_all_match)
}
})
}
func BenchmarkAllRegexpMismatch(b *testing.B) { func BenchmarkAllRegexpMismatch(b *testing.B) {
m := regexp.MustCompile(regexp_all) m := regexp.MustCompile(regexp_all)
f := []byte(fixture_all_mismatch) f := []byte(fixture_all_mismatch)