From 11b8167708a23ca36bc7591235ee3fcb94556257 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Tue, 16 Jun 2020 18:18:34 -0700 Subject: [PATCH] CInema: Migrate to using ini manifests --- .../mooneye-gb/acceptance/boot_div-S/config.ini | 5 +++++ .../acceptance/boot_div-S/manifest.yml | 3 --- .../acceptance/boot_div-dmg0/config.ini | 2 ++ .../acceptance/boot_div-dmg0/manifest.yml | 1 - .../acceptance/boot_div-dmgABCmgb/config.ini | 2 ++ .../acceptance/boot_div-dmgABCmgb/manifest.yml | 1 - .../acceptance/boot_div2-S/config.ini | 5 +++++ .../acceptance/boot_div2-S/manifest.yml | 3 --- .../acceptance/boot_hwio-S/config.ini | 2 ++ .../acceptance/boot_hwio-S/manifest.yml | 2 -- .../acceptance/boot_hwio-dmg0/config.ini | 2 ++ .../acceptance/boot_hwio-dmg0/manifest.yml | 1 - .../acceptance/boot_regs-dmg0/config.ini | 2 ++ .../acceptance/boot_regs-dmg0/manifest.yml | 1 - .../acceptance/boot_regs-mgb/config.ini | 2 ++ .../acceptance/boot_regs-mgb/manifest.yml | 2 -- .../acceptance/boot_regs-sgb/config.ini | 2 ++ .../acceptance/boot_regs-sgb/manifest.yml | 2 -- .../acceptance/boot_regs-sgb2/config.ini | 2 ++ .../acceptance/boot_regs-sgb2/manifest.yml | 2 -- .../oam_dma/sources-dmgABCmgbS/config.ini | 2 ++ .../oam_dma/sources-dmgABCmgbS/manifest.yml | 1 - .../acceptance/oam_dma_start/config.ini | 2 ++ .../acceptance/oam_dma_start/manifest.yml | 1 - .../ppu/hblank_ly_scx_timing-GS/config.ini | 2 ++ .../ppu/hblank_ly_scx_timing-GS/manifest.yml | 1 - .../ppu/intr_2_mode0_timing_sprites/config.ini | 2 ++ .../intr_2_mode0_timing_sprites/manifest.yml | 1 - .../ppu/lcdon_timing-dmgABCmgbS/config.ini | 2 ++ .../ppu/lcdon_timing-dmgABCmgbS/manifest.yml | 1 - .../ppu/lcdon_write_timing-GS/config.ini | 2 ++ .../ppu/lcdon_write_timing-GS/manifest.yml | 1 - .../acceptance/push_timing/config.ini | 2 ++ .../acceptance/push_timing/manifest.yml | 1 - .../serial/boot_sclk_align-dmgABCmgb/config.ini | 2 ++ .../boot_sclk_align-dmgABCmgb/manifest.yml | 1 - .../acceptance/timer/rapid_toggle/config.ini | 2 ++ .../acceptance/timer/rapid_toggle/manifest.yml | 1 - cinema/gb/mooneye-gb/config.ini | 6 ++++++ .../emulator-only/mbc1/bits_ram_en/config.ini | 2 ++ .../emulator-only/mbc1/bits_ram_en/manifest.yml | 1 - .../madness/mgb_oam_dma_halt_sprites/config.ini | 2 ++ .../mgb_oam_dma_halt_sprites/manifest.yml | 1 - cinema/gb/mooneye-gb/manifest.yml | 4 ---- .../manual-only/sprite_priority/config.ini | 2 ++ .../manual-only/sprite_priority/manifest.yml | 1 - .../misc/bits/unused_hwio-C/config.ini | 5 +++++ .../misc/bits/unused_hwio-C/manifest.yml | 3 --- cinema/gb/mooneye-gb/misc/boot_div-A/config.ini | 5 +++++ .../gb/mooneye-gb/misc/boot_div-A/manifest.yml | 3 --- .../gb/mooneye-gb/misc/boot_div-cgb0/config.ini | 2 ++ .../mooneye-gb/misc/boot_div-cgb0/manifest.yml | 1 - .../misc/boot_div-cgbABCDE/config.ini | 5 +++++ .../misc/boot_div-cgbABCDE/manifest.yml | 1 - .../gb/mooneye-gb/misc/boot_hwio-C/config.ini | 5 +++++ .../gb/mooneye-gb/misc/boot_hwio-C/manifest.yml | 3 --- .../gb/mooneye-gb/misc/boot_regs-A/config.ini | 2 ++ .../gb/mooneye-gb/misc/boot_regs-A/manifest.yml | 2 -- .../gb/mooneye-gb/misc/boot_regs-cgb/config.ini | 2 ++ .../mooneye-gb/misc/boot_regs-cgb/manifest.yml | 2 -- .../misc/ppu/vblank_stat_intr-C/config.ini | 5 +++++ .../misc/ppu/vblank_stat_intr-C/manifest.yml | 3 --- src/platform/python/cinema/test.py | 17 ++++++++++++----- src/platform/python/conftest.py | 15 ++++++++------- src/platform/python/setup.py | 2 +- src/platform/python/test_cinema.py | 2 +- 66 files changed, 109 insertions(+), 66 deletions(-) create mode 100644 cinema/gb/mooneye-gb/acceptance/boot_div-S/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/boot_div-S/manifest.yml create mode 100644 cinema/gb/mooneye-gb/acceptance/boot_div-dmg0/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/boot_div-dmg0/manifest.yml create mode 100644 cinema/gb/mooneye-gb/acceptance/boot_div-dmgABCmgb/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/boot_div-dmgABCmgb/manifest.yml create mode 100644 cinema/gb/mooneye-gb/acceptance/boot_div2-S/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/boot_div2-S/manifest.yml create mode 100644 cinema/gb/mooneye-gb/acceptance/boot_hwio-S/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/boot_hwio-S/manifest.yml create mode 100644 cinema/gb/mooneye-gb/acceptance/boot_hwio-dmg0/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/boot_hwio-dmg0/manifest.yml create mode 100644 cinema/gb/mooneye-gb/acceptance/boot_regs-dmg0/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/boot_regs-dmg0/manifest.yml create mode 100644 cinema/gb/mooneye-gb/acceptance/boot_regs-mgb/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/boot_regs-mgb/manifest.yml create mode 100644 cinema/gb/mooneye-gb/acceptance/boot_regs-sgb/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/boot_regs-sgb/manifest.yml create mode 100644 cinema/gb/mooneye-gb/acceptance/boot_regs-sgb2/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/boot_regs-sgb2/manifest.yml create mode 100644 cinema/gb/mooneye-gb/acceptance/oam_dma/sources-dmgABCmgbS/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/oam_dma/sources-dmgABCmgbS/manifest.yml create mode 100644 cinema/gb/mooneye-gb/acceptance/oam_dma_start/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/oam_dma_start/manifest.yml create mode 100644 cinema/gb/mooneye-gb/acceptance/ppu/hblank_ly_scx_timing-GS/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/ppu/hblank_ly_scx_timing-GS/manifest.yml create mode 100644 cinema/gb/mooneye-gb/acceptance/ppu/intr_2_mode0_timing_sprites/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/ppu/intr_2_mode0_timing_sprites/manifest.yml create mode 100644 cinema/gb/mooneye-gb/acceptance/ppu/lcdon_timing-dmgABCmgbS/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/ppu/lcdon_timing-dmgABCmgbS/manifest.yml create mode 100644 cinema/gb/mooneye-gb/acceptance/ppu/lcdon_write_timing-GS/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/ppu/lcdon_write_timing-GS/manifest.yml create mode 100644 cinema/gb/mooneye-gb/acceptance/push_timing/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/push_timing/manifest.yml create mode 100644 cinema/gb/mooneye-gb/acceptance/serial/boot_sclk_align-dmgABCmgb/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/serial/boot_sclk_align-dmgABCmgb/manifest.yml create mode 100644 cinema/gb/mooneye-gb/acceptance/timer/rapid_toggle/config.ini delete mode 100644 cinema/gb/mooneye-gb/acceptance/timer/rapid_toggle/manifest.yml create mode 100644 cinema/gb/mooneye-gb/config.ini create mode 100644 cinema/gb/mooneye-gb/emulator-only/mbc1/bits_ram_en/config.ini delete mode 100644 cinema/gb/mooneye-gb/emulator-only/mbc1/bits_ram_en/manifest.yml create mode 100644 cinema/gb/mooneye-gb/madness/mgb_oam_dma_halt_sprites/config.ini delete mode 100644 cinema/gb/mooneye-gb/madness/mgb_oam_dma_halt_sprites/manifest.yml delete mode 100644 cinema/gb/mooneye-gb/manifest.yml create mode 100644 cinema/gb/mooneye-gb/manual-only/sprite_priority/config.ini delete mode 100644 cinema/gb/mooneye-gb/manual-only/sprite_priority/manifest.yml create mode 100644 cinema/gb/mooneye-gb/misc/bits/unused_hwio-C/config.ini delete mode 100755 cinema/gb/mooneye-gb/misc/bits/unused_hwio-C/manifest.yml create mode 100644 cinema/gb/mooneye-gb/misc/boot_div-A/config.ini delete mode 100644 cinema/gb/mooneye-gb/misc/boot_div-A/manifest.yml create mode 100644 cinema/gb/mooneye-gb/misc/boot_div-cgb0/config.ini delete mode 100644 cinema/gb/mooneye-gb/misc/boot_div-cgb0/manifest.yml create mode 100644 cinema/gb/mooneye-gb/misc/boot_div-cgbABCDE/config.ini delete mode 100644 cinema/gb/mooneye-gb/misc/boot_div-cgbABCDE/manifest.yml create mode 100644 cinema/gb/mooneye-gb/misc/boot_hwio-C/config.ini delete mode 100755 cinema/gb/mooneye-gb/misc/boot_hwio-C/manifest.yml create mode 100644 cinema/gb/mooneye-gb/misc/boot_regs-A/config.ini delete mode 100755 cinema/gb/mooneye-gb/misc/boot_regs-A/manifest.yml create mode 100644 cinema/gb/mooneye-gb/misc/boot_regs-cgb/config.ini delete mode 100755 cinema/gb/mooneye-gb/misc/boot_regs-cgb/manifest.yml create mode 100644 cinema/gb/mooneye-gb/misc/ppu/vblank_stat_intr-C/config.ini delete mode 100644 cinema/gb/mooneye-gb/misc/ppu/vblank_stat_intr-C/manifest.yml diff --git a/cinema/gb/mooneye-gb/acceptance/boot_div-S/config.ini b/cinema/gb/mooneye-gb/acceptance/boot_div-S/config.ini new file mode 100644 index 000000000..389b7d8db --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/boot_div-S/config.ini @@ -0,0 +1,5 @@ +[testinfo] +fail=1 + +[ports.cinema] +gb.model=SGB diff --git a/cinema/gb/mooneye-gb/acceptance/boot_div-S/manifest.yml b/cinema/gb/mooneye-gb/acceptance/boot_div-S/manifest.yml deleted file mode 100644 index 631ac4568..000000000 --- a/cinema/gb/mooneye-gb/acceptance/boot_div-S/manifest.yml +++ /dev/null @@ -1,3 +0,0 @@ -config: - gb.model: SGB -fail: true diff --git a/cinema/gb/mooneye-gb/acceptance/boot_div-dmg0/config.ini b/cinema/gb/mooneye-gb/acceptance/boot_div-dmg0/config.ini new file mode 100644 index 000000000..7ddee425b --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/boot_div-dmg0/config.ini @@ -0,0 +1,2 @@ +[testinfo] +fail=1 diff --git a/cinema/gb/mooneye-gb/acceptance/boot_div-dmg0/manifest.yml b/cinema/gb/mooneye-gb/acceptance/boot_div-dmg0/manifest.yml deleted file mode 100644 index a697ada66..000000000 --- a/cinema/gb/mooneye-gb/acceptance/boot_div-dmg0/manifest.yml +++ /dev/null @@ -1 +0,0 @@ -fail: true diff --git a/cinema/gb/mooneye-gb/acceptance/boot_div-dmgABCmgb/config.ini b/cinema/gb/mooneye-gb/acceptance/boot_div-dmgABCmgb/config.ini new file mode 100644 index 000000000..7ddee425b --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/boot_div-dmgABCmgb/config.ini @@ -0,0 +1,2 @@ +[testinfo] +fail=1 diff --git a/cinema/gb/mooneye-gb/acceptance/boot_div-dmgABCmgb/manifest.yml b/cinema/gb/mooneye-gb/acceptance/boot_div-dmgABCmgb/manifest.yml deleted file mode 100644 index a697ada66..000000000 --- a/cinema/gb/mooneye-gb/acceptance/boot_div-dmgABCmgb/manifest.yml +++ /dev/null @@ -1 +0,0 @@ -fail: true diff --git a/cinema/gb/mooneye-gb/acceptance/boot_div2-S/config.ini b/cinema/gb/mooneye-gb/acceptance/boot_div2-S/config.ini new file mode 100644 index 000000000..389b7d8db --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/boot_div2-S/config.ini @@ -0,0 +1,5 @@ +[testinfo] +fail=1 + +[ports.cinema] +gb.model=SGB diff --git a/cinema/gb/mooneye-gb/acceptance/boot_div2-S/manifest.yml b/cinema/gb/mooneye-gb/acceptance/boot_div2-S/manifest.yml deleted file mode 100644 index 631ac4568..000000000 --- a/cinema/gb/mooneye-gb/acceptance/boot_div2-S/manifest.yml +++ /dev/null @@ -1,3 +0,0 @@ -config: - gb.model: SGB -fail: true diff --git a/cinema/gb/mooneye-gb/acceptance/boot_hwio-S/config.ini b/cinema/gb/mooneye-gb/acceptance/boot_hwio-S/config.ini new file mode 100644 index 000000000..ed9446e59 --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/boot_hwio-S/config.ini @@ -0,0 +1,2 @@ +[ports.cinema] +gb.model=SGB diff --git a/cinema/gb/mooneye-gb/acceptance/boot_hwio-S/manifest.yml b/cinema/gb/mooneye-gb/acceptance/boot_hwio-S/manifest.yml deleted file mode 100644 index 898a81837..000000000 --- a/cinema/gb/mooneye-gb/acceptance/boot_hwio-S/manifest.yml +++ /dev/null @@ -1,2 +0,0 @@ -config: - gb.model: SGB diff --git a/cinema/gb/mooneye-gb/acceptance/boot_hwio-dmg0/config.ini b/cinema/gb/mooneye-gb/acceptance/boot_hwio-dmg0/config.ini new file mode 100644 index 000000000..7ddee425b --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/boot_hwio-dmg0/config.ini @@ -0,0 +1,2 @@ +[testinfo] +fail=1 diff --git a/cinema/gb/mooneye-gb/acceptance/boot_hwio-dmg0/manifest.yml b/cinema/gb/mooneye-gb/acceptance/boot_hwio-dmg0/manifest.yml deleted file mode 100644 index a697ada66..000000000 --- a/cinema/gb/mooneye-gb/acceptance/boot_hwio-dmg0/manifest.yml +++ /dev/null @@ -1 +0,0 @@ -fail: true diff --git a/cinema/gb/mooneye-gb/acceptance/boot_regs-dmg0/config.ini b/cinema/gb/mooneye-gb/acceptance/boot_regs-dmg0/config.ini new file mode 100644 index 000000000..7ddee425b --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/boot_regs-dmg0/config.ini @@ -0,0 +1,2 @@ +[testinfo] +fail=1 diff --git a/cinema/gb/mooneye-gb/acceptance/boot_regs-dmg0/manifest.yml b/cinema/gb/mooneye-gb/acceptance/boot_regs-dmg0/manifest.yml deleted file mode 100644 index a697ada66..000000000 --- a/cinema/gb/mooneye-gb/acceptance/boot_regs-dmg0/manifest.yml +++ /dev/null @@ -1 +0,0 @@ -fail: true diff --git a/cinema/gb/mooneye-gb/acceptance/boot_regs-mgb/config.ini b/cinema/gb/mooneye-gb/acceptance/boot_regs-mgb/config.ini new file mode 100644 index 000000000..2764ebac4 --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/boot_regs-mgb/config.ini @@ -0,0 +1,2 @@ +[ports.cinema] +gb.model=MGB diff --git a/cinema/gb/mooneye-gb/acceptance/boot_regs-mgb/manifest.yml b/cinema/gb/mooneye-gb/acceptance/boot_regs-mgb/manifest.yml deleted file mode 100644 index 57c11b941..000000000 --- a/cinema/gb/mooneye-gb/acceptance/boot_regs-mgb/manifest.yml +++ /dev/null @@ -1,2 +0,0 @@ -config: - gb.model: MGB diff --git a/cinema/gb/mooneye-gb/acceptance/boot_regs-sgb/config.ini b/cinema/gb/mooneye-gb/acceptance/boot_regs-sgb/config.ini new file mode 100644 index 000000000..ed9446e59 --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/boot_regs-sgb/config.ini @@ -0,0 +1,2 @@ +[ports.cinema] +gb.model=SGB diff --git a/cinema/gb/mooneye-gb/acceptance/boot_regs-sgb/manifest.yml b/cinema/gb/mooneye-gb/acceptance/boot_regs-sgb/manifest.yml deleted file mode 100644 index 898a81837..000000000 --- a/cinema/gb/mooneye-gb/acceptance/boot_regs-sgb/manifest.yml +++ /dev/null @@ -1,2 +0,0 @@ -config: - gb.model: SGB diff --git a/cinema/gb/mooneye-gb/acceptance/boot_regs-sgb2/config.ini b/cinema/gb/mooneye-gb/acceptance/boot_regs-sgb2/config.ini new file mode 100644 index 000000000..511f010d2 --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/boot_regs-sgb2/config.ini @@ -0,0 +1,2 @@ +[ports.cinema] +gb.model=SGB2 diff --git a/cinema/gb/mooneye-gb/acceptance/boot_regs-sgb2/manifest.yml b/cinema/gb/mooneye-gb/acceptance/boot_regs-sgb2/manifest.yml deleted file mode 100644 index 0e5d5c091..000000000 --- a/cinema/gb/mooneye-gb/acceptance/boot_regs-sgb2/manifest.yml +++ /dev/null @@ -1,2 +0,0 @@ -config: - gb.model: SGB2 diff --git a/cinema/gb/mooneye-gb/acceptance/oam_dma/sources-dmgABCmgbS/config.ini b/cinema/gb/mooneye-gb/acceptance/oam_dma/sources-dmgABCmgbS/config.ini new file mode 100644 index 000000000..7ddee425b --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/oam_dma/sources-dmgABCmgbS/config.ini @@ -0,0 +1,2 @@ +[testinfo] +fail=1 diff --git a/cinema/gb/mooneye-gb/acceptance/oam_dma/sources-dmgABCmgbS/manifest.yml b/cinema/gb/mooneye-gb/acceptance/oam_dma/sources-dmgABCmgbS/manifest.yml deleted file mode 100644 index a697ada66..000000000 --- a/cinema/gb/mooneye-gb/acceptance/oam_dma/sources-dmgABCmgbS/manifest.yml +++ /dev/null @@ -1 +0,0 @@ -fail: true diff --git a/cinema/gb/mooneye-gb/acceptance/oam_dma_start/config.ini b/cinema/gb/mooneye-gb/acceptance/oam_dma_start/config.ini new file mode 100644 index 000000000..7ddee425b --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/oam_dma_start/config.ini @@ -0,0 +1,2 @@ +[testinfo] +fail=1 diff --git a/cinema/gb/mooneye-gb/acceptance/oam_dma_start/manifest.yml b/cinema/gb/mooneye-gb/acceptance/oam_dma_start/manifest.yml deleted file mode 100644 index a697ada66..000000000 --- a/cinema/gb/mooneye-gb/acceptance/oam_dma_start/manifest.yml +++ /dev/null @@ -1 +0,0 @@ -fail: true diff --git a/cinema/gb/mooneye-gb/acceptance/ppu/hblank_ly_scx_timing-GS/config.ini b/cinema/gb/mooneye-gb/acceptance/ppu/hblank_ly_scx_timing-GS/config.ini new file mode 100644 index 000000000..7ddee425b --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/ppu/hblank_ly_scx_timing-GS/config.ini @@ -0,0 +1,2 @@ +[testinfo] +fail=1 diff --git a/cinema/gb/mooneye-gb/acceptance/ppu/hblank_ly_scx_timing-GS/manifest.yml b/cinema/gb/mooneye-gb/acceptance/ppu/hblank_ly_scx_timing-GS/manifest.yml deleted file mode 100644 index a697ada66..000000000 --- a/cinema/gb/mooneye-gb/acceptance/ppu/hblank_ly_scx_timing-GS/manifest.yml +++ /dev/null @@ -1 +0,0 @@ -fail: true diff --git a/cinema/gb/mooneye-gb/acceptance/ppu/intr_2_mode0_timing_sprites/config.ini b/cinema/gb/mooneye-gb/acceptance/ppu/intr_2_mode0_timing_sprites/config.ini new file mode 100644 index 000000000..7ddee425b --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/ppu/intr_2_mode0_timing_sprites/config.ini @@ -0,0 +1,2 @@ +[testinfo] +fail=1 diff --git a/cinema/gb/mooneye-gb/acceptance/ppu/intr_2_mode0_timing_sprites/manifest.yml b/cinema/gb/mooneye-gb/acceptance/ppu/intr_2_mode0_timing_sprites/manifest.yml deleted file mode 100644 index a697ada66..000000000 --- a/cinema/gb/mooneye-gb/acceptance/ppu/intr_2_mode0_timing_sprites/manifest.yml +++ /dev/null @@ -1 +0,0 @@ -fail: true diff --git a/cinema/gb/mooneye-gb/acceptance/ppu/lcdon_timing-dmgABCmgbS/config.ini b/cinema/gb/mooneye-gb/acceptance/ppu/lcdon_timing-dmgABCmgbS/config.ini new file mode 100644 index 000000000..7ddee425b --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/ppu/lcdon_timing-dmgABCmgbS/config.ini @@ -0,0 +1,2 @@ +[testinfo] +fail=1 diff --git a/cinema/gb/mooneye-gb/acceptance/ppu/lcdon_timing-dmgABCmgbS/manifest.yml b/cinema/gb/mooneye-gb/acceptance/ppu/lcdon_timing-dmgABCmgbS/manifest.yml deleted file mode 100644 index a697ada66..000000000 --- a/cinema/gb/mooneye-gb/acceptance/ppu/lcdon_timing-dmgABCmgbS/manifest.yml +++ /dev/null @@ -1 +0,0 @@ -fail: true diff --git a/cinema/gb/mooneye-gb/acceptance/ppu/lcdon_write_timing-GS/config.ini b/cinema/gb/mooneye-gb/acceptance/ppu/lcdon_write_timing-GS/config.ini new file mode 100644 index 000000000..7ddee425b --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/ppu/lcdon_write_timing-GS/config.ini @@ -0,0 +1,2 @@ +[testinfo] +fail=1 diff --git a/cinema/gb/mooneye-gb/acceptance/ppu/lcdon_write_timing-GS/manifest.yml b/cinema/gb/mooneye-gb/acceptance/ppu/lcdon_write_timing-GS/manifest.yml deleted file mode 100644 index a697ada66..000000000 --- a/cinema/gb/mooneye-gb/acceptance/ppu/lcdon_write_timing-GS/manifest.yml +++ /dev/null @@ -1 +0,0 @@ -fail: true diff --git a/cinema/gb/mooneye-gb/acceptance/push_timing/config.ini b/cinema/gb/mooneye-gb/acceptance/push_timing/config.ini new file mode 100644 index 000000000..7ddee425b --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/push_timing/config.ini @@ -0,0 +1,2 @@ +[testinfo] +fail=1 diff --git a/cinema/gb/mooneye-gb/acceptance/push_timing/manifest.yml b/cinema/gb/mooneye-gb/acceptance/push_timing/manifest.yml deleted file mode 100644 index a697ada66..000000000 --- a/cinema/gb/mooneye-gb/acceptance/push_timing/manifest.yml +++ /dev/null @@ -1 +0,0 @@ -fail: true diff --git a/cinema/gb/mooneye-gb/acceptance/serial/boot_sclk_align-dmgABCmgb/config.ini b/cinema/gb/mooneye-gb/acceptance/serial/boot_sclk_align-dmgABCmgb/config.ini new file mode 100644 index 000000000..7ddee425b --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/serial/boot_sclk_align-dmgABCmgb/config.ini @@ -0,0 +1,2 @@ +[testinfo] +fail=1 diff --git a/cinema/gb/mooneye-gb/acceptance/serial/boot_sclk_align-dmgABCmgb/manifest.yml b/cinema/gb/mooneye-gb/acceptance/serial/boot_sclk_align-dmgABCmgb/manifest.yml deleted file mode 100644 index a697ada66..000000000 --- a/cinema/gb/mooneye-gb/acceptance/serial/boot_sclk_align-dmgABCmgb/manifest.yml +++ /dev/null @@ -1 +0,0 @@ -fail: true diff --git a/cinema/gb/mooneye-gb/acceptance/timer/rapid_toggle/config.ini b/cinema/gb/mooneye-gb/acceptance/timer/rapid_toggle/config.ini new file mode 100644 index 000000000..7ddee425b --- /dev/null +++ b/cinema/gb/mooneye-gb/acceptance/timer/rapid_toggle/config.ini @@ -0,0 +1,2 @@ +[testinfo] +fail=1 diff --git a/cinema/gb/mooneye-gb/acceptance/timer/rapid_toggle/manifest.yml b/cinema/gb/mooneye-gb/acceptance/timer/rapid_toggle/manifest.yml deleted file mode 100644 index a697ada66..000000000 --- a/cinema/gb/mooneye-gb/acceptance/timer/rapid_toggle/manifest.yml +++ /dev/null @@ -1 +0,0 @@ -fail: true diff --git a/cinema/gb/mooneye-gb/config.ini b/cinema/gb/mooneye-gb/config.ini new file mode 100644 index 000000000..6b38213c9 --- /dev/null +++ b/cinema/gb/mooneye-gb/config.ini @@ -0,0 +1,6 @@ +[testinfo] +skip=60 +frames=1 + +[ports.cinema] +sgb.borders=0 diff --git a/cinema/gb/mooneye-gb/emulator-only/mbc1/bits_ram_en/config.ini b/cinema/gb/mooneye-gb/emulator-only/mbc1/bits_ram_en/config.ini new file mode 100644 index 000000000..7ddee425b --- /dev/null +++ b/cinema/gb/mooneye-gb/emulator-only/mbc1/bits_ram_en/config.ini @@ -0,0 +1,2 @@ +[testinfo] +fail=1 diff --git a/cinema/gb/mooneye-gb/emulator-only/mbc1/bits_ram_en/manifest.yml b/cinema/gb/mooneye-gb/emulator-only/mbc1/bits_ram_en/manifest.yml deleted file mode 100644 index a697ada66..000000000 --- a/cinema/gb/mooneye-gb/emulator-only/mbc1/bits_ram_en/manifest.yml +++ /dev/null @@ -1 +0,0 @@ -fail: true diff --git a/cinema/gb/mooneye-gb/madness/mgb_oam_dma_halt_sprites/config.ini b/cinema/gb/mooneye-gb/madness/mgb_oam_dma_halt_sprites/config.ini new file mode 100644 index 000000000..7ddee425b --- /dev/null +++ b/cinema/gb/mooneye-gb/madness/mgb_oam_dma_halt_sprites/config.ini @@ -0,0 +1,2 @@ +[testinfo] +fail=1 diff --git a/cinema/gb/mooneye-gb/madness/mgb_oam_dma_halt_sprites/manifest.yml b/cinema/gb/mooneye-gb/madness/mgb_oam_dma_halt_sprites/manifest.yml deleted file mode 100644 index a697ada66..000000000 --- a/cinema/gb/mooneye-gb/madness/mgb_oam_dma_halt_sprites/manifest.yml +++ /dev/null @@ -1 +0,0 @@ -fail: true diff --git a/cinema/gb/mooneye-gb/manifest.yml b/cinema/gb/mooneye-gb/manifest.yml deleted file mode 100644 index bbd7d13ba..000000000 --- a/cinema/gb/mooneye-gb/manifest.yml +++ /dev/null @@ -1,4 +0,0 @@ -skip: 60 -frames: 1 -config: - sgb.borders: false diff --git a/cinema/gb/mooneye-gb/manual-only/sprite_priority/config.ini b/cinema/gb/mooneye-gb/manual-only/sprite_priority/config.ini new file mode 100644 index 000000000..7ddee425b --- /dev/null +++ b/cinema/gb/mooneye-gb/manual-only/sprite_priority/config.ini @@ -0,0 +1,2 @@ +[testinfo] +fail=1 diff --git a/cinema/gb/mooneye-gb/manual-only/sprite_priority/manifest.yml b/cinema/gb/mooneye-gb/manual-only/sprite_priority/manifest.yml deleted file mode 100644 index a697ada66..000000000 --- a/cinema/gb/mooneye-gb/manual-only/sprite_priority/manifest.yml +++ /dev/null @@ -1 +0,0 @@ -fail: true diff --git a/cinema/gb/mooneye-gb/misc/bits/unused_hwio-C/config.ini b/cinema/gb/mooneye-gb/misc/bits/unused_hwio-C/config.ini new file mode 100644 index 000000000..07d7f0398 --- /dev/null +++ b/cinema/gb/mooneye-gb/misc/bits/unused_hwio-C/config.ini @@ -0,0 +1,5 @@ +[testinfo] +fail=1 + +[ports.cinema] +gb.model=CGB diff --git a/cinema/gb/mooneye-gb/misc/bits/unused_hwio-C/manifest.yml b/cinema/gb/mooneye-gb/misc/bits/unused_hwio-C/manifest.yml deleted file mode 100755 index c9aa5eb1d..000000000 --- a/cinema/gb/mooneye-gb/misc/bits/unused_hwio-C/manifest.yml +++ /dev/null @@ -1,3 +0,0 @@ -config: - gb.model: CGB -fail: true diff --git a/cinema/gb/mooneye-gb/misc/boot_div-A/config.ini b/cinema/gb/mooneye-gb/misc/boot_div-A/config.ini new file mode 100644 index 000000000..d1235047e --- /dev/null +++ b/cinema/gb/mooneye-gb/misc/boot_div-A/config.ini @@ -0,0 +1,5 @@ +[testinfo] +fail=1 + +[ports.cinema] +gb.model=AGB diff --git a/cinema/gb/mooneye-gb/misc/boot_div-A/manifest.yml b/cinema/gb/mooneye-gb/misc/boot_div-A/manifest.yml deleted file mode 100644 index 82bc08df2..000000000 --- a/cinema/gb/mooneye-gb/misc/boot_div-A/manifest.yml +++ /dev/null @@ -1,3 +0,0 @@ -config: - gb.model: AGB -fail: true diff --git a/cinema/gb/mooneye-gb/misc/boot_div-cgb0/config.ini b/cinema/gb/mooneye-gb/misc/boot_div-cgb0/config.ini new file mode 100644 index 000000000..7ddee425b --- /dev/null +++ b/cinema/gb/mooneye-gb/misc/boot_div-cgb0/config.ini @@ -0,0 +1,2 @@ +[testinfo] +fail=1 diff --git a/cinema/gb/mooneye-gb/misc/boot_div-cgb0/manifest.yml b/cinema/gb/mooneye-gb/misc/boot_div-cgb0/manifest.yml deleted file mode 100644 index a697ada66..000000000 --- a/cinema/gb/mooneye-gb/misc/boot_div-cgb0/manifest.yml +++ /dev/null @@ -1 +0,0 @@ -fail: true diff --git a/cinema/gb/mooneye-gb/misc/boot_div-cgbABCDE/config.ini b/cinema/gb/mooneye-gb/misc/boot_div-cgbABCDE/config.ini new file mode 100644 index 000000000..07d7f0398 --- /dev/null +++ b/cinema/gb/mooneye-gb/misc/boot_div-cgbABCDE/config.ini @@ -0,0 +1,5 @@ +[testinfo] +fail=1 + +[ports.cinema] +gb.model=CGB diff --git a/cinema/gb/mooneye-gb/misc/boot_div-cgbABCDE/manifest.yml b/cinema/gb/mooneye-gb/misc/boot_div-cgbABCDE/manifest.yml deleted file mode 100644 index a697ada66..000000000 --- a/cinema/gb/mooneye-gb/misc/boot_div-cgbABCDE/manifest.yml +++ /dev/null @@ -1 +0,0 @@ -fail: true diff --git a/cinema/gb/mooneye-gb/misc/boot_hwio-C/config.ini b/cinema/gb/mooneye-gb/misc/boot_hwio-C/config.ini new file mode 100644 index 000000000..07d7f0398 --- /dev/null +++ b/cinema/gb/mooneye-gb/misc/boot_hwio-C/config.ini @@ -0,0 +1,5 @@ +[testinfo] +fail=1 + +[ports.cinema] +gb.model=CGB diff --git a/cinema/gb/mooneye-gb/misc/boot_hwio-C/manifest.yml b/cinema/gb/mooneye-gb/misc/boot_hwio-C/manifest.yml deleted file mode 100755 index c9aa5eb1d..000000000 --- a/cinema/gb/mooneye-gb/misc/boot_hwio-C/manifest.yml +++ /dev/null @@ -1,3 +0,0 @@ -config: - gb.model: CGB -fail: true diff --git a/cinema/gb/mooneye-gb/misc/boot_regs-A/config.ini b/cinema/gb/mooneye-gb/misc/boot_regs-A/config.ini new file mode 100644 index 000000000..db562beed --- /dev/null +++ b/cinema/gb/mooneye-gb/misc/boot_regs-A/config.ini @@ -0,0 +1,2 @@ +[ports.cinema] +gb.model=AGB diff --git a/cinema/gb/mooneye-gb/misc/boot_regs-A/manifest.yml b/cinema/gb/mooneye-gb/misc/boot_regs-A/manifest.yml deleted file mode 100755 index f5c803cc5..000000000 --- a/cinema/gb/mooneye-gb/misc/boot_regs-A/manifest.yml +++ /dev/null @@ -1,2 +0,0 @@ -config: - gb.model: AGB diff --git a/cinema/gb/mooneye-gb/misc/boot_regs-cgb/config.ini b/cinema/gb/mooneye-gb/misc/boot_regs-cgb/config.ini new file mode 100644 index 000000000..f041754a4 --- /dev/null +++ b/cinema/gb/mooneye-gb/misc/boot_regs-cgb/config.ini @@ -0,0 +1,2 @@ +[ports.cinema] +gb.model=CGB diff --git a/cinema/gb/mooneye-gb/misc/boot_regs-cgb/manifest.yml b/cinema/gb/mooneye-gb/misc/boot_regs-cgb/manifest.yml deleted file mode 100755 index 6cd567986..000000000 --- a/cinema/gb/mooneye-gb/misc/boot_regs-cgb/manifest.yml +++ /dev/null @@ -1,2 +0,0 @@ -config: - gb.model: CGB diff --git a/cinema/gb/mooneye-gb/misc/ppu/vblank_stat_intr-C/config.ini b/cinema/gb/mooneye-gb/misc/ppu/vblank_stat_intr-C/config.ini new file mode 100644 index 000000000..07d7f0398 --- /dev/null +++ b/cinema/gb/mooneye-gb/misc/ppu/vblank_stat_intr-C/config.ini @@ -0,0 +1,5 @@ +[testinfo] +fail=1 + +[ports.cinema] +gb.model=CGB diff --git a/cinema/gb/mooneye-gb/misc/ppu/vblank_stat_intr-C/manifest.yml b/cinema/gb/mooneye-gb/misc/ppu/vblank_stat_intr-C/manifest.yml deleted file mode 100644 index c9aa5eb1d..000000000 --- a/cinema/gb/mooneye-gb/misc/ppu/vblank_stat_intr-C/manifest.yml +++ /dev/null @@ -1,3 +0,0 @@ -config: - gb.model: CGB -fail: true diff --git a/src/platform/python/cinema/test.py b/src/platform/python/cinema/test.py index 3a8e61b31..dd47708f9 100644 --- a/src/platform/python/cinema/test.py +++ b/src/platform/python/cinema/test.py @@ -6,10 +6,10 @@ import cinema.movie import itertools import glob import re -import yaml from copy import deepcopy from cinema import VideoFrame from cinema.util import dict_merge +from configparser import ConfigParser class CinemaTest(object): @@ -22,8 +22,15 @@ class CinemaTest(object): self.name = '.'.join(path) self.settings = settings try: - with open(os.path.join(self.path, 'manifest.yml'), 'r') as f: - dict_merge(self.settings, yaml.safe_load(f)) + with open(os.path.join(self.path, 'config.ini'), 'r') as f: + cfg = ConfigParser() + cfg.read_file(f) + settings = {} + if 'testinfo' in cfg: + settings = dict(cfg['testinfo']) + if 'ports.cinema' in cfg: + settings['config'] = dict(cfg['ports.cinema']) + dict_merge(self.settings, settings) except IOError: pass self.tests = {} @@ -49,9 +56,9 @@ class CinemaTest(object): def output_settings(self): output_settings = {} if 'frames' in self.settings: - output_settings['limit'] = self.settings['frames'] + output_settings['limit'] = int(self.settings['frames']) if 'skip' in self.settings: - output_settings['skip'] = self.settings['skip'] + output_settings['skip'] = int(self.settings['skip']) return output_settings def __lt__(self, other): diff --git a/src/platform/python/conftest.py b/src/platform/python/conftest.py index 06826a741..e495fedc7 100644 --- a/src/platform/python/conftest.py +++ b/src/platform/python/conftest.py @@ -3,7 +3,7 @@ import itertools import os import os.path import pytest -import yaml +from configparser import ConfigParser def pytest_addoption(parser): parser.addoption("--rebaseline", action="store_true", help="output a new baseline instead of testing") @@ -39,11 +39,12 @@ def pytest_exception_interact(node, call, report): diffNorm.save(os.path.join(outdir, DIFF_NORM % i)) if node.config.getoption("--mark-failing"): + settings = ConfigParser() try: - with open(os.path.join(vtest.path, 'manifest.yml'), 'r') as f: - settings = yaml.safe_load(f) + with open(os.path.join(vtest.path, 'config.ini'), 'r') as f: + settings.read_file(f) except IOError: - settings = {} - settings['fail'] = True - with open(os.path.join(vtest.path, 'manifest.yml'), 'w') as f: - yaml.dump(settings, f, default_flow_style=False) + pass + settings.set('testinfo', 'fail', '1') + with open(os.path.join(vtest.path, 'config.ini'), 'w') as f: + settings.write(f) diff --git a/src/platform/python/setup.py b/src/platform/python/setup.py index c9030313c..3a599c2e7 100644 --- a/src/platform/python/setup.py +++ b/src/platform/python/setup.py @@ -23,7 +23,7 @@ setup( packages=["mgba"], setup_requires=['cffi>=1.6', 'pytest-runner'], install_requires=['cffi>=1.6', 'cached-property'], - extras_require={'pil': ['Pillow>=2.3'], 'cinema': ['pyyaml', 'pytest']}, + extras_require={'pil': ['Pillow>=2.3'], 'cinema': ['pytest']}, tests_require=['pytest'], cffi_modules=["_builder.py:ffi"], license="MPL 2.0", diff --git a/src/platform/python/test_cinema.py b/src/platform/python/test_cinema.py index 9f413f0eb..ced169010 100644 --- a/src/platform/python/test_cinema.py +++ b/src/platform/python/test_cinema.py @@ -24,7 +24,7 @@ def pytest_generate_tests(metafunc): for test in testList: marks = [] xfail = test.settings.get('fail') - if xfail: + if xfail and bool(xfail): marks = pytest.mark.xfail(reason=xfail if isinstance(xfail, str) else None) params.append(pytest.param(test, id=test.name, marks=marks)) metafunc.parametrize('vtest', params, indirect=True)