libretro/mgba
1
0
Fork 0
mirror of https://github.com/libretro/mgba.git synced 2024-11-27 02:00:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CInema: Migrate to using ini manifests

Browse Source
This commit is contained in:
Vicki Pfau 2020-06-16 18:18:34 -07:00
parent 0de8f432ec
commit 11b8167708
66 changed files with 109 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinema/gb/mooneye-gb/acceptance/boot_div-S/config.ini Normal file
View File

@ -0,0 +1,5 @@
[testinfo]
fail=1
[ports.cinema]
gb.model=SGB

3
cinema/gb/mooneye-gb/acceptance/boot_div-S/manifest.yml
View File

@ -1,3 +0,0 @@
config:
gb.model: SGB
fail: true

2
cinema/gb/mooneye-gb/acceptance/boot_div-dmg0/config.ini Normal file
View File

@ -0,0 +1,2 @@
[testinfo]
fail=1

1
cinema/gb/mooneye-gb/acceptance/boot_div-dmg0/manifest.yml
View File

@ -1 +0,0 @@
fail: true

2
cinema/gb/mooneye-gb/acceptance/boot_div-dmgABCmgb/config.ini Normal file
View File

@ -0,0 +1,2 @@
[testinfo]
fail=1

1
cinema/gb/mooneye-gb/acceptance/boot_div-dmgABCmgb/manifest.yml
View File

@ -1 +0,0 @@
fail: true

5
cinema/gb/mooneye-gb/acceptance/boot_div2-S/config.ini Normal file
View File

@ -0,0 +1,5 @@
[testinfo]
fail=1
[ports.cinema]
gb.model=SGB

3
cinema/gb/mooneye-gb/acceptance/boot_div2-S/manifest.yml
View File

@ -1,3 +0,0 @@
config:
gb.model: SGB
fail: true

2
cinema/gb/mooneye-gb/acceptance/boot_hwio-S/config.ini Normal file
View File

@ -0,0 +1,2 @@
[ports.cinema]
gb.model=SGB

2
cinema/gb/mooneye-gb/acceptance/boot_hwio-S/manifest.yml
View File

@ -1,2 +0,0 @@
config:
gb.model: SGB

2
cinema/gb/mooneye-gb/acceptance/boot_hwio-dmg0/config.ini Normal file
View File

@ -0,0 +1,2 @@
[testinfo]
fail=1

1
cinema/gb/mooneye-gb/acceptance/boot_hwio-dmg0/manifest.yml
View File

@ -1 +0,0 @@
fail: true

2
cinema/gb/mooneye-gb/acceptance/boot_regs-dmg0/config.ini Normal file
View File

@ -0,0 +1,2 @@
[testinfo]
fail=1

1
cinema/gb/mooneye-gb/acceptance/boot_regs-dmg0/manifest.yml
View File

@ -1 +0,0 @@
fail: true

2
cinema/gb/mooneye-gb/acceptance/boot_regs-mgb/config.ini Normal file
View File

@ -0,0 +1,2 @@
[ports.cinema]
gb.model=MGB

2
cinema/gb/mooneye-gb/acceptance/boot_regs-mgb/manifest.yml
View File

@ -1,2 +0,0 @@
config:
gb.model: MGB

2
cinema/gb/mooneye-gb/acceptance/boot_regs-sgb/config.ini Normal file
View File

@ -0,0 +1,2 @@
[ports.cinema]
gb.model=SGB

2
cinema/gb/mooneye-gb/acceptance/boot_regs-sgb/manifest.yml
View File

@ -1,2 +0,0 @@
config:
gb.model: SGB

2
cinema/gb/mooneye-gb/acceptance/boot_regs-sgb2/config.ini Normal file
View File

@ -0,0 +1,2 @@
[ports.cinema]
gb.model=SGB2

2
cinema/gb/mooneye-gb/acceptance/boot_regs-sgb2/manifest.yml
View File

@ -1,2 +0,0 @@
config:
gb.model: SGB2

2
cinema/gb/mooneye-gb/acceptance/oam_dma/sources-dmgABCmgbS/config.ini Normal file
View File

@ -0,0 +1,2 @@
[testinfo]
fail=1

1
cinema/gb/mooneye-gb/acceptance/oam_dma/sources-dmgABCmgbS/manifest.yml
View File

@ -1 +0,0 @@
fail: true

2
cinema/gb/mooneye-gb/acceptance/oam_dma_start/config.ini Normal file
View File

@ -0,0 +1,2 @@
[testinfo]
fail=1

1
cinema/gb/mooneye-gb/acceptance/oam_dma_start/manifest.yml
View File

@ -1 +0,0 @@
fail: true

2
cinema/gb/mooneye-gb/acceptance/ppu/hblank_ly_scx_timing-GS/config.ini Normal file
View File

@ -0,0 +1,2 @@
[testinfo]
fail=1

1
cinema/gb/mooneye-gb/acceptance/ppu/hblank_ly_scx_timing-GS/manifest.yml
View File

@ -1 +0,0 @@
fail: true

2
cinema/gb/mooneye-gb/acceptance/ppu/intr_2_mode0_timing_sprites/config.ini Normal file
View File

@ -0,0 +1,2 @@
[testinfo]
fail=1

1
cinema/gb/mooneye-gb/acceptance/ppu/intr_2_mode0_timing_sprites/manifest.yml
View File

@ -1 +0,0 @@
fail: true

2
cinema/gb/mooneye-gb/acceptance/ppu/lcdon_timing-dmgABCmgbS/config.ini Normal file
View File

@ -0,0 +1,2 @@
[testinfo]
fail=1

1
cinema/gb/mooneye-gb/acceptance/ppu/lcdon_timing-dmgABCmgbS/manifest.yml
View File

@ -1 +0,0 @@
fail: true

2
cinema/gb/mooneye-gb/acceptance/ppu/lcdon_write_timing-GS/config.ini Normal file
View File

@ -0,0 +1,2 @@
[testinfo]
fail=1

1
cinema/gb/mooneye-gb/acceptance/ppu/lcdon_write_timing-GS/manifest.yml
View File

@ -1 +0,0 @@
fail: true

2
cinema/gb/mooneye-gb/acceptance/push_timing/config.ini Normal file
View File

@ -0,0 +1,2 @@
[testinfo]
fail=1

1
cinema/gb/mooneye-gb/acceptance/push_timing/manifest.yml
View File

@ -1 +0,0 @@
fail: true

2
cinema/gb/mooneye-gb/acceptance/serial/boot_sclk_align-dmgABCmgb/config.ini Normal file
View File

@ -0,0 +1,2 @@
[testinfo]
fail=1

1
cinema/gb/mooneye-gb/acceptance/serial/boot_sclk_align-dmgABCmgb/manifest.yml
View File

@ -1 +0,0 @@
fail: true

2
cinema/gb/mooneye-gb/acceptance/timer/rapid_toggle/config.ini Normal file
View File

@ -0,0 +1,2 @@
[testinfo]
fail=1

1
cinema/gb/mooneye-gb/acceptance/timer/rapid_toggle/manifest.yml
View File

@ -1 +0,0 @@
fail: true

6
cinema/gb/mooneye-gb/config.ini Normal file
View File

@ -0,0 +1,6 @@
[testinfo]
skip=60
frames=1
[ports.cinema]
sgb.borders=0

2
cinema/gb/mooneye-gb/emulator-only/mbc1/bits_ram_en/config.ini Normal file
View File

@ -0,0 +1,2 @@
[testinfo]
fail=1

1
cinema/gb/mooneye-gb/emulator-only/mbc1/bits_ram_en/manifest.yml
View File

@ -1 +0,0 @@
fail: true

2
cinema/gb/mooneye-gb/madness/mgb_oam_dma_halt_sprites/config.ini Normal file
View File

@ -0,0 +1,2 @@
[testinfo]
fail=1

1
cinema/gb/mooneye-gb/madness/mgb_oam_dma_halt_sprites/manifest.yml
View File

@ -1 +0,0 @@
fail: true

4
cinema/gb/mooneye-gb/manifest.yml
View File

@ -1,4 +0,0 @@
skip: 60
frames: 1
config:
sgb.borders: false

2
cinema/gb/mooneye-gb/manual-only/sprite_priority/config.ini Normal file
View File

@ -0,0 +1,2 @@
[testinfo]
fail=1

1
cinema/gb/mooneye-gb/manual-only/sprite_priority/manifest.yml
View File

@ -1 +0,0 @@
fail: true

5
cinema/gb/mooneye-gb/misc/bits/unused_hwio-C/config.ini Normal file
View File

@ -0,0 +1,5 @@
[testinfo]
fail=1
[ports.cinema]
gb.model=CGB

3
cinema/gb/mooneye-gb/misc/bits/unused_hwio-C/manifest.yml
View File

@ -1,3 +0,0 @@
config:
gb.model: CGB
fail: true

5
cinema/gb/mooneye-gb/misc/boot_div-A/config.ini Normal file
View File

@ -0,0 +1,5 @@
[testinfo]
fail=1
[ports.cinema]
gb.model=AGB

3
cinema/gb/mooneye-gb/misc/boot_div-A/manifest.yml
View File

@ -1,3 +0,0 @@
config:
gb.model: AGB
fail: true

2
cinema/gb/mooneye-gb/misc/boot_div-cgb0/config.ini Normal file
View File

@ -0,0 +1,2 @@
[testinfo]
fail=1

1
cinema/gb/mooneye-gb/misc/boot_div-cgb0/manifest.yml
View File

@ -1 +0,0 @@
fail: true

5
cinema/gb/mooneye-gb/misc/boot_div-cgbABCDE/config.ini Normal file
View File

@ -0,0 +1,5 @@
[testinfo]
fail=1
[ports.cinema]
gb.model=CGB

1
cinema/gb/mooneye-gb/misc/boot_div-cgbABCDE/manifest.yml
View File

@ -1 +0,0 @@
fail: true

5
cinema/gb/mooneye-gb/misc/boot_hwio-C/config.ini Normal file
View File

@ -0,0 +1,5 @@
[testinfo]
fail=1
[ports.cinema]
gb.model=CGB

3
cinema/gb/mooneye-gb/misc/boot_hwio-C/manifest.yml
View File

@ -1,3 +0,0 @@
config:
gb.model: CGB
fail: true

2
cinema/gb/mooneye-gb/misc/boot_regs-A/config.ini Normal file
View File

@ -0,0 +1,2 @@
[ports.cinema]
gb.model=AGB

2
cinema/gb/mooneye-gb/misc/boot_regs-A/manifest.yml
View File

@ -1,2 +0,0 @@
config:
gb.model: AGB

2
cinema/gb/mooneye-gb/misc/boot_regs-cgb/config.ini Normal file
View File

@ -0,0 +1,2 @@
[ports.cinema]
gb.model=CGB

2
cinema/gb/mooneye-gb/misc/boot_regs-cgb/manifest.yml
View File

@ -1,2 +0,0 @@
config:
gb.model: CGB

5
cinema/gb/mooneye-gb/misc/ppu/vblank_stat_intr-C/config.ini Normal file
View File

@ -0,0 +1,5 @@
[testinfo]
fail=1
[ports.cinema]
gb.model=CGB

3
cinema/gb/mooneye-gb/misc/ppu/vblank_stat_intr-C/manifest.yml
View File

@ -1,3 +0,0 @@
config:
gb.model: CGB
fail: true

17
src/platform/python/cinema/test.py
View File

@ -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):

15
src/platform/python/conftest.py
View File

@ -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)

2
src/platform/python/setup.py
View File

@ -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",

2
src/platform/python/test_cinema.py
View File

@ -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)