fancy-regex - fix autopkgtests.
Peter Michael Green
2 years ago
| 1 | 1 | |
| 2 | 2 | * Team upload. |
| 3 | 3 | * Package fancy-regex 0.7.1 from crates.io using debcargo 2.5.0 |
| 4 | * Fix the autopkgtest | |
| 5 | + Disable bench that relies on criterion so the rest of the testsuite can run. | |
| 6 | + Disable tests that rely on files not included in the Debian package. | |
| 7 | + Apply patch to use quickcheck 0.9 based on reversion of a couple of upstream | |
| 8 | commits. | |
| 4 | 9 | |
| 5 | 10 | -- Peter Michael Green <plugwash@debian.org> Sat, 15 Jan 2022 15:30:19 +0000 |
| 6 | 11 |
| 0 | Index: fancy-regex/tests/oniguruma.rs | |
| 1 | =================================================================== | |
| 2 | --- fancy-regex.orig/tests/oniguruma.rs | |
| 3 | +++ fancy-regex/tests/oniguruma.rs | |
| 4 | @@ -200,7 +200,7 @@ fn run_test(test: &Test) -> Option<Strin | |
| 5 | } | |
| 6 | } | |
| 7 | ||
| 8 | -#[test] | |
| 9 | +/*#[test] | |
| 10 | fn oniguruma() { | |
| 11 | let tests: Vec<Test> = parse_tests(include_str!("oniguruma/test_utf8.c")) | |
| 12 | .into_iter() | |
| 13 | @@ -244,4 +244,4 @@ fn oniguruma() { | |
| 14 | "{} successful Oniguruma tests, {} ignored", | |
| 15 | success, ignored | |
| 16 | ); | |
| 17 | -} | |
| 18 | +}*/ |
| 0 | Index: fancy-regex/Cargo.toml | |
| 1 | =================================================================== | |
| 2 | --- fancy-regex.orig/Cargo.toml | |
| 3 | +++ fancy-regex/Cargo.toml | |
| 4 | @@ -22,16 +22,11 @@ categories = ["text-processing"] | |
| 5 | license = "MIT" | |
| 6 | repository = "https://github.com/fancy-regex/fancy-regex" | |
| 7 | ||
| 8 | -[[bench]] | |
| 9 | -name = "bench" | |
| 10 | -harness = false | |
| 11 | [dependencies.bit-set] | |
| 12 | version = "0.5" | |
| 13 | ||
| 14 | [dependencies.regex] | |
| 15 | version = "1.2" | |
| 16 | -[dev-dependencies.criterion] | |
| 17 | -version = "= 0.3.4" | |
| 18 | ||
| 19 | [dev-dependencies.matches] | |
| 20 | version = "0.1.8" | |
| 21 | Index: fancy-regex/benches/bench.rs | |
| 22 | =================================================================== | |
| 23 | --- fancy-regex.orig/benches/bench.rs | |
| 24 | +++ fancy-regex/benches/bench.rs | |
| 25 | @@ -18,7 +18,7 @@ | |
| 26 | // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | |
| 27 | // THE SOFTWARE. | |
| 28 | ||
| 29 | -#[macro_use] | |
| 30 | +/*#[macro_use] | |
| 31 | extern crate criterion; | |
| 32 | ||
| 33 | use criterion::Criterion; | |
| 34 | @@ -109,3 +109,8 @@ criterion_group!( | |
| 35 | ); | |
| 36 | ||
| 37 | criterion_main!(benches, slow_benches); | |
| 38 | +*/ | |
| 39 | + | |
| 40 | +fn main() { | |
| 41 | + //dummy main function. | |
| 42 | +} |
| 0 | This patch is based on reverts of upstream commits 5fba8dcb445285eb16dcec17b310742d371e5e38 | |
| 1 | and cd51d86929b169a0918bf4c4d85d984239f29806 adapted for use in the Debian package. | |
| 2 | ||
| 3 | Index: fancy-regex/src/vm.rs | |
| 4 | =================================================================== | |
| 5 | --- fancy-regex.orig/src/vm.rs | |
| 6 | +++ fancy-regex/src/vm.rs | |
| 7 | @@ -672,6 +672,7 @@ pub(crate) fn run( | |
| 8 | mod tests { | |
| 9 | use super::*; | |
| 10 | use quickcheck::{quickcheck, Arbitrary, Gen}; | |
| 11 | + use rand::Rng; | |
| 12 | ||
| 13 | #[test] | |
| 14 | fn state_push_pop() { | |
| 15 | @@ -786,14 +787,11 @@ mod tests { | |
| 16 | } | |
| 17 | ||
| 18 | impl Arbitrary for Operation { | |
| 19 | - fn arbitrary(g: &mut Gen) -> Self { | |
| 20 | - match g.choose(&[0, 1, 2]) { | |
| 21 | - Some(0) => Operation::Push, | |
| 22 | - Some(1) => Operation::Pop, | |
| 23 | - _ => Operation::Save( | |
| 24 | - *g.choose(&[0usize, 1, 2, 3, 4]).unwrap(), | |
| 25 | - usize::arbitrary(g), | |
| 26 | - ), | |
| 27 | + fn arbitrary<G: Gen>(g: &mut G) -> Self { | |
| 28 | + match g.gen_range(0, 3) { | |
| 29 | + 0 => Operation::Push, | |
| 30 | + 1 => Operation::Pop, | |
| 31 | + _ => Operation::Save(g.gen_range(0, 5), g.gen_range(0, usize::MAX)), | |
| 32 | } | |
| 33 | } | |
| 34 | } | |
| 35 | Index: fancy-regex/Cargo.toml | |
| 36 | =================================================================== | |
| 37 | --- fancy-regex.orig/Cargo.toml | |
| 38 | +++ fancy-regex/Cargo.toml | |
| 39 | @@ -32,7 +32,10 @@ version = "1.2" | |
| 40 | version = "0.1.8" | |
| 41 | ||
| 42 | [dev-dependencies.quickcheck] | |
| 43 | -version = "= 1.0.1" | |
| 44 | +version = "0.9" | |
| 45 | + | |
| 46 | +[dev-dependencies.rand] | |
| 47 | +version = "0.7" | |
| 48 | ||
| 49 | [features] | |
| 50 | track_caller = [] |