Skip to content

Commit 831758c

Browse files
committed
Fix test for running with missing-pixi-permitted feature
Not sure how this passed the test run for https://github.com/mozilla/mp4parse-rust/runs/3267258755
1 parent 2851627 commit 831758c

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

mp4parse/tests/public.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ static AVIF_CLAP: &str = "tests/clap-basic-1_3x3-to-1x1.avif";
6565
static AVIF_GRID: &str = "av1-avif/testFiles/Microsoft/Summer_in_Tomsk_720p_5x4_grid.avif";
6666
static AVIF_LSEL: &str =
6767
"av1-avif/testFiles/Apple/multilayer_examples/animals_00_multilayer_lsel.avif";
68+
static AVIF_NO_PIXI_IMAGES: &[&str] = &[IMAGE_AVIF_NO_PIXI, IMAGE_AVIF_NO_ALPHA_PIXI];
6869
static AVIF_UNSUPPORTED_IMAGES: &[&str] = &[
6970
AVIF_A1OP,
7071
AVIF_A1LX,
@@ -1054,6 +1055,11 @@ fn to_canonical_paths(strs: &[&str]) -> Vec<std::path::PathBuf> {
10541055
fn public_avif_read_samples_impl(strictness: ParseStrictness) {
10551056
let corrupt_images = to_canonical_paths(AV1_AVIF_CORRUPT_IMAGES);
10561057
let unsupported_images = to_canonical_paths(AVIF_UNSUPPORTED_IMAGES);
1058+
let legal_no_pixi_images = if cfg!(feature = "missing-pixi-permitted") {
1059+
to_canonical_paths(AVIF_NO_PIXI_IMAGES)
1060+
} else {
1061+
vec![]
1062+
};
10571063
for dir in AVIF_TEST_DIRS {
10581064
for entry in walkdir::WalkDir::new(dir) {
10591065
let entry = entry.expect("AVIF entry");
@@ -1062,9 +1068,11 @@ fn public_avif_read_samples_impl(strictness: ParseStrictness) {
10621068
eprintln!("Skipping {:?}", path);
10631069
continue; // Skip directories, ReadMe.txt, etc.
10641070
}
1065-
let corrupt = path.canonicalize().unwrap().parent().unwrap()
1071+
let corrupt = (path.canonicalize().unwrap().parent().unwrap()
10661072
== std::fs::canonicalize(AVIF_CORRUPT_IMAGES_DIR).unwrap()
1067-
|| corrupt_images.contains(&path.canonicalize().unwrap());
1073+
|| corrupt_images.contains(&path.canonicalize().unwrap()))
1074+
&& !legal_no_pixi_images.contains(&path.canonicalize().unwrap());
1075+
10681076
let unsupported = unsupported_images.contains(&path.canonicalize().unwrap());
10691077
println!(
10701078
"parsing {}{}{:?}",

0 commit comments

Comments
 (0)