From 10111ac5ecc06e855e7b3722cbb74a2b37fc9996 Mon Sep 17 00:00:00 2001 From: Sergio Martin Date: Sat, 20 Jan 2024 19:39:31 +0100 Subject: [PATCH] Refactoring tests --- tests/.gitignore | 1 + tests/README.md | 20 ++++- .../warpless.sol => arkanoid.warpless.sol} | 0 .../warps.test => arkanoid.warpless.test} | 4 +- .../warps.sol => arkanoid.warps.sol} | 0 .../warpless.test => arkanoid.warps.test} | 4 +- tests/arkanoid/meson.build | 9 --- ...ercent.sol => castlevania1.anyPercent.sol} | 0 ...fist.test => castlevania1.anyPercent.test} | 5 +- ...pacifist.sol => castlevania1.pacifist.sol} | 0 ...ercent.test => castlevania1.pacifist.test} | 4 +- tests/castlevania1/meson.build | 7 -- .../anyPercent.sol => galaga.anyPercent.sol} | 0 ...anyPercent.test => galaga.anyPercent.test} | 4 +- tests/galaga/meson.build | 4 - ...nyPercent.sol => ironSword.anyPercent.sol} | 0 ...Percent.test => ironSword.anyPercent.test} | 4 +- tests/ironSword/meson.build | 4 - tests/meson.build | 74 ++++++++++++------ .../playaround.sol => metroid.playaround.sol} | 0 ...layaround.test => metroid.playaround.test} | 4 +- tests/metroid/meson.build | 4 - ...ercent.sol => nigelMansell.anyPercent.sol} | 0 ...cent.test => nigelMansell.anyPercent.test} | 4 +- tests/nigelMansell/meson.build | 4 - ...Percent.sol => ninjaGaiden.anyPercent.sol} | 0 ...rcent.test => ninjaGaiden.anyPercent.test} | 4 +- .../pacifist.sol => ninjaGaiden.pacifist.sol} | 0 ...acifist.test => ninjaGaiden.pacifist.test} | 4 +- tests/ninjaGaiden/meson.build | 7 -- ...ercent.sol => ninjaGaiden2.anyPercent.sol} | 0 ...fist.test => ninjaGaiden2.anyPercent.test} | 4 +- ...pacifist.sol => ninjaGaiden2.pacifist.sol} | 0 ...ercent.test => ninjaGaiden2.pacifist.test} | 4 +- tests/ninjaGaiden2/meson.build | 7 -- ...ent.sol => novaTheSquirrel.anyPercent.sol} | 0 ...t.test => novaTheSquirrel.anyPercent.test} | 4 +- tests/novaTheSquirrel/README.md | 7 -- tests/novaTheSquirrel/meson.build | 4 - ...cent.sol => princeOfPersia.anyPercent.sol} | 0 ...nt.test => princeOfPersia.anyPercent.test} | 4 +- tests/princeOfPersia/meson.build | 4 - ...l => saintSeiyaKanketsuHen.anyPercent.sol} | 0 tests/saintSeiyaKanketsuHen.anyPercent.test | 7 ++ tests/saintSeiyaKanketsuHen/anyPercent.test | 7 -- tests/saintSeiyaKanketsuHen/meson.build | 4 - ...=> saintSeiyaOugonDensetsu.anyPercent.sol} | 0 ...> saintSeiyaOugonDensetsu.anyPercent.test} | 4 +- tests/saintSeiyaOugonDensetsu/meson.build | 4 - ...rcent.sol => saiyuukiWorld.anyPercent.sol} | 0 tests/saiyuukiWorld.anyPercent.test | 7 ++ ...astHalf.sol => saiyuukiWorld.lastHalf.sol} | 0 ...alf.state => saiyuukiWorld.lastHalf.state} | Bin tests/saiyuukiWorld.lastHalf.test | 7 ++ tests/saiyuukiWorld/anyPercent.test | 8 -- tests/saiyuukiWorld/lastHalf.test | 8 -- tests/saiyuukiWorld/meson.build | 9 --- ...Percent.sol => solarJetman.anyPercent.sol} | 0 ...rcent.test => solarJetman.anyPercent.test} | 4 +- tests/solarJetman/meson.build | 4 - .../anyPercent.sol => sprilo.anyPercent.sol} | 0 ...anyPercent.test => sprilo.anyPercent.test} | 4 +- tests/sprilo/README.md | 7 -- tests/sprilo/meson.build | 4 - ...rpless.sol => superMarioBros.warpless.sol} | 0 ...arps.test => superMarioBros.warpless.test} | 4 +- .../warps.sol => superMarioBros.warps.sol} | 0 ...arpless.test => superMarioBros.warps.test} | 4 +- tests/superMarioBros/README.md | 4 - tests/superMarioBros/meson.build | 7 -- .../warps.sol => superMarioBros3.warps.sol} | 0 .../warps.test => superMarioBros3.warps.test} | 4 +- tests/superMarioBros3/meson.build | 4 - ...ercent.sol => superOffroad.anyPercent.sol} | 0 ...cent.test => superOffroad.anyPercent.test} | 4 +- tests/superOffroad/meson.build | 4 - .../anyPercent.sol => tennis.anyPercent.sol} | 0 ...anyPercent.test => tennis.anyPercent.test} | 4 +- tests/tennis/meson.build | 4 - 79 files changed, 136 insertions(+), 208 deletions(-) rename tests/{arkanoid/warpless.sol => arkanoid.warpless.sol} (100%) rename tests/{arkanoid/warps.test => arkanoid.warpless.test} (67%) rename tests/{arkanoid/warps.sol => arkanoid.warps.sol} (100%) rename tests/{arkanoid/warpless.test => arkanoid.warps.test} (68%) delete mode 100644 tests/arkanoid/meson.build rename tests/{castlevania1/anyPercent.sol => castlevania1.anyPercent.sol} (100%) rename tests/{castlevania1/pacifist.test => castlevania1.anyPercent.test} (53%) rename tests/{castlevania1/pacifist.sol => castlevania1.pacifist.sol} (100%) rename tests/{castlevania1/anyPercent.test => castlevania1.pacifist.test} (62%) delete mode 100644 tests/castlevania1/meson.build rename tests/{galaga/anyPercent.sol => galaga.anyPercent.sol} (100%) rename tests/{galaga/anyPercent.test => galaga.anyPercent.test} (55%) delete mode 100644 tests/galaga/meson.build rename tests/{ironSword/anyPercent.sol => ironSword.anyPercent.sol} (100%) rename tests/{ironSword/anyPercent.test => ironSword.anyPercent.test} (52%) delete mode 100644 tests/ironSword/meson.build rename tests/{metroid/playaround.sol => metroid.playaround.sol} (100%) rename tests/{metroid/playaround.test => metroid.playaround.test} (57%) delete mode 100644 tests/metroid/meson.build rename tests/{nigelMansell/anyPercent.sol => nigelMansell.anyPercent.sol} (100%) rename tests/{nigelMansell/anyPercent.test => nigelMansell.anyPercent.test} (50%) delete mode 100644 tests/nigelMansell/meson.build rename tests/{ninjaGaiden/anyPercent.sol => ninjaGaiden.anyPercent.sol} (100%) rename tests/{ninjaGaiden/anyPercent.test => ninjaGaiden.anyPercent.test} (57%) rename tests/{ninjaGaiden/pacifist.sol => ninjaGaiden.pacifist.sol} (100%) rename tests/{ninjaGaiden/pacifist.test => ninjaGaiden.pacifist.test} (57%) delete mode 100644 tests/ninjaGaiden/meson.build rename tests/{ninjaGaiden2/anyPercent.sol => ninjaGaiden2.anyPercent.sol} (100%) rename tests/{ninjaGaiden2/pacifist.test => ninjaGaiden2.anyPercent.test} (50%) rename tests/{ninjaGaiden2/pacifist.sol => ninjaGaiden2.pacifist.sol} (100%) rename tests/{ninjaGaiden2/anyPercent.test => ninjaGaiden2.pacifist.test} (50%) delete mode 100644 tests/ninjaGaiden2/meson.build rename tests/{novaTheSquirrel/anyPercent.sol => novaTheSquirrel.anyPercent.sol} (100%) rename tests/{novaTheSquirrel/anyPercent.test => novaTheSquirrel.anyPercent.test} (60%) delete mode 100644 tests/novaTheSquirrel/README.md delete mode 100644 tests/novaTheSquirrel/meson.build rename tests/{princeOfPersia/anyPercent.sol => princeOfPersia.anyPercent.sol} (100%) rename tests/{princeOfPersia/anyPercent.test => princeOfPersia.anyPercent.test} (55%) delete mode 100644 tests/princeOfPersia/meson.build rename tests/{saintSeiyaKanketsuHen/anyPercent.sol => saintSeiyaKanketsuHen.anyPercent.sol} (100%) create mode 100644 tests/saintSeiyaKanketsuHen.anyPercent.test delete mode 100644 tests/saintSeiyaKanketsuHen/anyPercent.test delete mode 100644 tests/saintSeiyaKanketsuHen/meson.build rename tests/{saintSeiyaOugonDensetsu/anyPercent.sol => saintSeiyaOugonDensetsu.anyPercent.sol} (100%) rename tests/{saintSeiyaOugonDensetsu/anyPercent.test => saintSeiyaOugonDensetsu.anyPercent.test} (51%) delete mode 100644 tests/saintSeiyaOugonDensetsu/meson.build rename tests/{saiyuukiWorld/anyPercent.sol => saiyuukiWorld.anyPercent.sol} (100%) create mode 100644 tests/saiyuukiWorld.anyPercent.test rename tests/{saiyuukiWorld/lastHalf.sol => saiyuukiWorld.lastHalf.sol} (100%) rename tests/{saiyuukiWorld/lastHalf.state => saiyuukiWorld.lastHalf.state} (100%) create mode 100644 tests/saiyuukiWorld.lastHalf.test delete mode 100644 tests/saiyuukiWorld/anyPercent.test delete mode 100644 tests/saiyuukiWorld/lastHalf.test delete mode 100644 tests/saiyuukiWorld/meson.build rename tests/{solarJetman/anyPercent.sol => solarJetman.anyPercent.sol} (100%) rename tests/{solarJetman/anyPercent.test => solarJetman.anyPercent.test} (50%) delete mode 100644 tests/solarJetman/meson.build rename tests/{sprilo/anyPercent.sol => sprilo.anyPercent.sol} (100%) rename tests/{sprilo/anyPercent.test => sprilo.anyPercent.test} (62%) delete mode 100644 tests/sprilo/README.md delete mode 100644 tests/sprilo/meson.build rename tests/{superMarioBros/warpless.sol => superMarioBros.warpless.sol} (100%) rename tests/{superMarioBros/warps.test => superMarioBros.warpless.test} (55%) rename tests/{superMarioBros/warps.sol => superMarioBros.warps.sol} (100%) rename tests/{superMarioBros/warpless.test => superMarioBros.warps.test} (56%) delete mode 100644 tests/superMarioBros/README.md delete mode 100644 tests/superMarioBros/meson.build rename tests/{superMarioBros3/warps.sol => superMarioBros3.warps.sol} (100%) rename tests/{superMarioBros3/warps.test => superMarioBros3.warps.test} (54%) delete mode 100644 tests/superMarioBros3/meson.build rename tests/{superOffroad/anyPercent.sol => superOffroad.anyPercent.sol} (100%) rename tests/{superOffroad/anyPercent.test => superOffroad.anyPercent.test} (51%) delete mode 100644 tests/superOffroad/meson.build rename tests/{tennis/anyPercent.sol => tennis.anyPercent.sol} (100%) rename tests/{tennis/anyPercent.test => tennis.anyPercent.test} (60%) delete mode 100644 tests/tennis/meson.build diff --git a/tests/.gitignore b/tests/.gitignore index 4f4a32c..0a169d8 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -5,4 +5,5 @@ test.sol *.hash *.out +*.sh diff --git a/tests/README.md b/tests/README.md index ee212c9..7c7db27 100644 --- a/tests/README.md +++ b/tests/README.md @@ -1 +1,19 @@ -Some of the sequences hosted in this folder correspond to movies published in tasvideos.org under the Creative Commons 2.0 license. These movies were created by the author of this code (Sergio Martin, a.k.a. eien86), unless stated otherwise. +Some of the sequences hosted in this folder correspond to movies published in tasvideos.org under the Creative Commons 2.0 license. These movies were created by the author of this code (Sergio Martin, a.k.a. eien86) and collaborators, unless otherwise stated. + +Notes: + +Sprilo is a open-source free game. This rom was obtained from + - https://itch.io/jam/game-off-2017 + - https://github.com/cbrwn/gameoff + - We use the movie https://tasvideos.org/3557G by MrTASer distributed under the CC2.0 license + +Nova The Squirrel is a open-source free game. This rom was obtained from + - https://github.com/NovaSquirrel/NovaTheSquirrel + - https://novasquirrel.itch.io/nova-the-squirrel + - We use the movie https://tasvideos.org/5246M by Cephla distributed under the CC2.0 license + +For Saiyuuki World + - We use the movie https://tasvideos.org/4422M by aiqiyou & J.Y distributed under the CC2.0 license + + For Metroid + - We use part of the movie https://tasvideos.org/3666M by The8bitbeast distributed under the CC2.0 license \ No newline at end of file diff --git a/tests/arkanoid/warpless.sol b/tests/arkanoid.warpless.sol similarity index 100% rename from tests/arkanoid/warpless.sol rename to tests/arkanoid.warpless.sol diff --git a/tests/arkanoid/warps.test b/tests/arkanoid.warpless.test similarity index 67% rename from tests/arkanoid/warps.test rename to tests/arkanoid.warpless.test index 397eff1..a41acfc 100644 --- a/tests/arkanoid/warps.test +++ b/tests/arkanoid.warpless.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Arkanoid (U) [!].nes", + "Rom File": "roms/Arkanoid (U) [!].nes", "Expected ROM SHA1": "B2B30C4F30DD853C215C17B0C67CFE63D61A3062", "Initial State File": "", - "Sequence File": "warps.sol", + "Sequence File": "arkanoid.warpless.sol", "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "MAPR", "CTRL", "APUR" ] } diff --git a/tests/arkanoid/warps.sol b/tests/arkanoid.warps.sol similarity index 100% rename from tests/arkanoid/warps.sol rename to tests/arkanoid.warps.sol diff --git a/tests/arkanoid/warpless.test b/tests/arkanoid.warps.test similarity index 68% rename from tests/arkanoid/warpless.test rename to tests/arkanoid.warps.test index 7478ef2..f6b2d6c 100644 --- a/tests/arkanoid/warpless.test +++ b/tests/arkanoid.warps.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Arkanoid (U) [!].nes", + "Rom File": "roms/Arkanoid (U) [!].nes", "Expected ROM SHA1": "B2B30C4F30DD853C215C17B0C67CFE63D61A3062", "Initial State File": "", - "Sequence File": "warpless.sol", + "Sequence File": "arkanoid.warps.sol", "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "MAPR", "CTRL", "APUR" ] } diff --git a/tests/arkanoid/meson.build b/tests/arkanoid/meson.build deleted file mode 100644 index 399ce6c..0000000 --- a/tests/arkanoid/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -game = 'arkanoid' - -bash = find_program('bash') - -goal = 'warpless' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) - -goal = 'warps' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file diff --git a/tests/castlevania1/anyPercent.sol b/tests/castlevania1.anyPercent.sol similarity index 100% rename from tests/castlevania1/anyPercent.sol rename to tests/castlevania1.anyPercent.sol diff --git a/tests/castlevania1/pacifist.test b/tests/castlevania1.anyPercent.test similarity index 53% rename from tests/castlevania1/pacifist.test rename to tests/castlevania1.anyPercent.test index 7c80858..e54c381 100644 --- a/tests/castlevania1/pacifist.test +++ b/tests/castlevania1.anyPercent.test @@ -1,8 +1,7 @@ { - "Rom File": "../roms/Castlevania (U) (PRG0) [!].nes", + "Rom File": "roms/Castlevania (U) (PRG0) [!].nes", "Expected ROM SHA1": "A31B8BD5B370A9103343C866F3C2B2998E889341", "Initial State File": "", - "Verification State File": "pacifist.final.state", - "Sequence File": "pacifist.sol", + "Sequence File": "castlevania1.anyPercent.sol", "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/castlevania1/pacifist.sol b/tests/castlevania1.pacifist.sol similarity index 100% rename from tests/castlevania1/pacifist.sol rename to tests/castlevania1.pacifist.sol diff --git a/tests/castlevania1/anyPercent.test b/tests/castlevania1.pacifist.test similarity index 62% rename from tests/castlevania1/anyPercent.test rename to tests/castlevania1.pacifist.test index b6d7a54..e59321f 100644 --- a/tests/castlevania1/anyPercent.test +++ b/tests/castlevania1.pacifist.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Castlevania (U) (PRG0) [!].nes", + "Rom File": "roms/Castlevania (U) (PRG0) [!].nes", "Expected ROM SHA1": "A31B8BD5B370A9103343C866F3C2B2998E889341", "Initial State File": "", - "Sequence File": "anyPercent.sol", + "Sequence File": "castlevania1.pacifist.sol", "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/castlevania1/meson.build b/tests/castlevania1/meson.build deleted file mode 100644 index e492077..0000000 --- a/tests/castlevania1/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -game = 'castlevania1' - -goal = 'anyPercent' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) - -goal = 'pacifist' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file diff --git a/tests/galaga/anyPercent.sol b/tests/galaga.anyPercent.sol similarity index 100% rename from tests/galaga/anyPercent.sol rename to tests/galaga.anyPercent.sol diff --git a/tests/galaga/anyPercent.test b/tests/galaga.anyPercent.test similarity index 55% rename from tests/galaga/anyPercent.test rename to tests/galaga.anyPercent.test index 4d13a0a..52f15f5 100644 --- a/tests/galaga/anyPercent.test +++ b/tests/galaga.anyPercent.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Galaga - Demons of Death (U) [!].nes", + "Rom File": "roms/Galaga - Demons of Death (U) [!].nes", "Expected ROM SHA1": "DA54C223D79FA59EB95437854B677CF69B5CAC8A", "Initial State File": "", - "Sequence File": "anyPercent.sol", + "Sequence File": "galaga.anyPercent.sol", "Disable State Blocks": [ ] } diff --git a/tests/galaga/meson.build b/tests/galaga/meson.build deleted file mode 100644 index b5de4c7..0000000 --- a/tests/galaga/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -game = 'galaga' - -goal = 'anyPercent' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file diff --git a/tests/ironSword/anyPercent.sol b/tests/ironSword.anyPercent.sol similarity index 100% rename from tests/ironSword/anyPercent.sol rename to tests/ironSword.anyPercent.sol diff --git a/tests/ironSword/anyPercent.test b/tests/ironSword.anyPercent.test similarity index 52% rename from tests/ironSword/anyPercent.test rename to tests/ironSword.anyPercent.test index 979ee99..35abf9b 100644 --- a/tests/ironSword/anyPercent.test +++ b/tests/ironSword.anyPercent.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Ironsword - Wizards & Warriors II (U) [!].nes", + "Rom File": "roms/Ironsword - Wizards & Warriors II (U) [!].nes", "Expected ROM SHA1": "97B79E432F62403FB9F877090850C41112A9A168", "Initial State File": "", - "Sequence File": "anyPercent.sol", + "Sequence File": "ironSword.anyPercent.sol", "Disable State Blocks": [ ] } diff --git a/tests/ironSword/meson.build b/tests/ironSword/meson.build deleted file mode 100644 index 19dea0f..0000000 --- a/tests/ironSword/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -game = 'ironSword' - -goal = 'anyPercent' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file diff --git a/tests/meson.build b/tests/meson.build index 4b0badc..bc4936e 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,31 +1,59 @@ nomalloc = environment({'MALLOC_PERTURB_': '0'}) bash = find_program('bash') -testCommands = ['../run_test.sh', quickerNESTester.path(), quickNESTester.path() ] +testCommands = ['run_test.sh', quickerNESTester.path(), quickNESTester.path() ] testTimeout = 120 +# Tests for copyrighted game roms (only for local testing or own CI runners) +protectedTestSet = [ + 'arkanoid.warpless.test', + 'arkanoid.warps.test', + 'castlevania1.anyPercent.test', + 'castlevania1.pacifist.test', + 'galaga.anyPercent.test', + 'ironSword.anyPercent.test', + 'metroid.playaround.test', + 'nigelMansell.anyPercent.test', + 'ninjaGaiden.anyPercent.test', + 'ninjaGaiden.pacifist.test', + 'ninjaGaiden2.anyPercent.test', + 'ninjaGaiden2.pacifist.test', + 'novaTheSquirrel.anyPercent.test', + 'princeOfPersia.anyPercent.test', + 'saintSeiyaKanketsuHen.anyPercent.test', + 'saintSeiyaOugonDensetsu.anyPercent.test', + 'saiyuukiWorld.anyPercent.test', + 'saiyuukiWorld.lastHalf.test', + 'solarJetman.anyPercent.test', + 'sprilo.anyPercent.test', + 'superMarioBros.warpless.test', + 'superMarioBros.warps.test', + 'superMarioBros3.warps.test', + 'superOffroad.anyPercent.test', + 'tennis.anyPercent.test', +] + +# Tests for open source free roms (for public cloud testing) +openSourceTestSet = [ + 'novaTheSquirrel.anyPercent.test', + 'sprilo.anyPercent.test', +] + +# Creating test set based on whether copyrighted roms are to be used +testSet = openSourceTestSet if get_option('onlyOpenSource') == false - -subdir('arkanoid') -subdir('castlevania1') -subdir('superOffroad') -subdir('princeOfPersia') -subdir('ninjaGaiden') -subdir('ninjaGaiden2') -subdir('ironSword') -subdir('solarJetman') -subdir('tennis') -subdir('metroid') -subdir('nigelMansell') -subdir('galaga') -subdir('saintSeiyaOugonDensetsu') -subdir('saintSeiyaKanketsuHen') -subdir('superMarioBros') -subdir('superMarioBros3') -subdir('saiyuukiWorld') - + testSet += protectedTestSet endif -# Open source games -subdir('sprilo') -subdir('novaTheSquirrel') \ No newline at end of file +# Adding tests to the suite +foreach testFile : testSet + testSuite = testFile.split('.')[0] + testName = testFile.split('.')[1] + test(testName, + bash, + workdir : meson.current_source_dir(), + timeout: testTimeout, + args : [ testCommands, testFile, '--cycleType', 'Full'], + suite : [ testSuite ]) +endforeach + diff --git a/tests/metroid/playaround.sol b/tests/metroid.playaround.sol similarity index 100% rename from tests/metroid/playaround.sol rename to tests/metroid.playaround.sol diff --git a/tests/metroid/playaround.test b/tests/metroid.playaround.test similarity index 57% rename from tests/metroid/playaround.test rename to tests/metroid.playaround.test index 26bbebe..08e46e7 100644 --- a/tests/metroid/playaround.test +++ b/tests/metroid.playaround.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Metroid (U) (PRG0) [!].nes", + "Rom File": "roms/Metroid (U) (PRG0) [!].nes", "Expected ROM SHA1": "ECF39EC5A33E6A6F832F03E8FFC61C5D53F4F90B", "Initial State File": "", - "Sequence File": "playaround.sol", + "Sequence File": "metroid.playaround.sol", "Disable State Blocks": [ ] } diff --git a/tests/metroid/meson.build b/tests/metroid/meson.build deleted file mode 100644 index facce12..0000000 --- a/tests/metroid/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -game = 'metroid' - -goal = 'playaround' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file diff --git a/tests/nigelMansell/anyPercent.sol b/tests/nigelMansell.anyPercent.sol similarity index 100% rename from tests/nigelMansell/anyPercent.sol rename to tests/nigelMansell.anyPercent.sol diff --git a/tests/nigelMansell/anyPercent.test b/tests/nigelMansell.anyPercent.test similarity index 50% rename from tests/nigelMansell/anyPercent.test rename to tests/nigelMansell.anyPercent.test index 652245e..bb935ee 100644 --- a/tests/nigelMansell/anyPercent.test +++ b/tests/nigelMansell.anyPercent.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Nigel Mansell's World Championship Challenge (U) [!].nes", + "Rom File": "roms/Nigel Mansell's World Championship Challenge (U) [!].nes", "Expected ROM SHA1": "BBE5CF2DFA0B5422776A530D6F1B617238A8569F", "Initial State File": "", - "Sequence File": "anyPercent.sol", + "Sequence File": "nigelMansell.anyPercent.sol", "Disable State Blocks": [ ] } diff --git a/tests/nigelMansell/meson.build b/tests/nigelMansell/meson.build deleted file mode 100644 index c5fb0f0..0000000 --- a/tests/nigelMansell/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -game = 'nigelMansell' - -goal = 'anyPercent' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file diff --git a/tests/ninjaGaiden/anyPercent.sol b/tests/ninjaGaiden.anyPercent.sol similarity index 100% rename from tests/ninjaGaiden/anyPercent.sol rename to tests/ninjaGaiden.anyPercent.sol diff --git a/tests/ninjaGaiden/anyPercent.test b/tests/ninjaGaiden.anyPercent.test similarity index 57% rename from tests/ninjaGaiden/anyPercent.test rename to tests/ninjaGaiden.anyPercent.test index 59955cb..c60d688 100644 --- a/tests/ninjaGaiden/anyPercent.test +++ b/tests/ninjaGaiden.anyPercent.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Ninja Gaiden (U) [!].nes", + "Rom File": "roms/Ninja Gaiden (U) [!].nes", "Expected ROM SHA1": "CA513F841D75EFEB33BB8099FB02BEEB39F6BB9C", "Initial State File": "", - "Sequence File": "anyPercent.sol", + "Sequence File": "ninjaGaiden.anyPercent.sol", "Disable State Blocks": [ ] } diff --git a/tests/ninjaGaiden/pacifist.sol b/tests/ninjaGaiden.pacifist.sol similarity index 100% rename from tests/ninjaGaiden/pacifist.sol rename to tests/ninjaGaiden.pacifist.sol diff --git a/tests/ninjaGaiden/pacifist.test b/tests/ninjaGaiden.pacifist.test similarity index 57% rename from tests/ninjaGaiden/pacifist.test rename to tests/ninjaGaiden.pacifist.test index 49d2741..7f6ac1c 100644 --- a/tests/ninjaGaiden/pacifist.test +++ b/tests/ninjaGaiden.pacifist.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Ninja Gaiden (U) [!].nes", + "Rom File": "roms/Ninja Gaiden (U) [!].nes", "Expected ROM SHA1": "CA513F841D75EFEB33BB8099FB02BEEB39F6BB9C", "Initial State File": "", - "Sequence File": "pacifist.sol", + "Sequence File": "ninjaGaiden.pacifist.sol", "Disable State Blocks": [ ] } diff --git a/tests/ninjaGaiden/meson.build b/tests/ninjaGaiden/meson.build deleted file mode 100644 index 1716225..0000000 --- a/tests/ninjaGaiden/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -game = 'ninjaGaiden' - -goal = 'anyPercent' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) - -goal = 'pacifist' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file diff --git a/tests/ninjaGaiden2/anyPercent.sol b/tests/ninjaGaiden2.anyPercent.sol similarity index 100% rename from tests/ninjaGaiden2/anyPercent.sol rename to tests/ninjaGaiden2.anyPercent.sol diff --git a/tests/ninjaGaiden2/pacifist.test b/tests/ninjaGaiden2.anyPercent.test similarity index 50% rename from tests/ninjaGaiden2/pacifist.test rename to tests/ninjaGaiden2.anyPercent.test index 7c99047..b600e71 100644 --- a/tests/ninjaGaiden2/pacifist.test +++ b/tests/ninjaGaiden2.anyPercent.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Ninja Gaiden II - The Dark Sword of Chaos (U) [!].nes", + "Rom File": "roms/Ninja Gaiden II - The Dark Sword of Chaos (U) [!].nes", "Expected ROM SHA1": "B1796660E4A4CEFC72181D4BF4F97999BC048A77", "Initial State File": "", - "Sequence File": "pacifist.sol", + "Sequence File": "ninjaGaiden2.anyPercent.sol", "Disable State Blocks": [ ] } diff --git a/tests/ninjaGaiden2/pacifist.sol b/tests/ninjaGaiden2.pacifist.sol similarity index 100% rename from tests/ninjaGaiden2/pacifist.sol rename to tests/ninjaGaiden2.pacifist.sol diff --git a/tests/ninjaGaiden2/anyPercent.test b/tests/ninjaGaiden2.pacifist.test similarity index 50% rename from tests/ninjaGaiden2/anyPercent.test rename to tests/ninjaGaiden2.pacifist.test index 22d90b0..172d6bc 100644 --- a/tests/ninjaGaiden2/anyPercent.test +++ b/tests/ninjaGaiden2.pacifist.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Ninja Gaiden II - The Dark Sword of Chaos (U) [!].nes", + "Rom File": "roms/Ninja Gaiden II - The Dark Sword of Chaos (U) [!].nes", "Expected ROM SHA1": "B1796660E4A4CEFC72181D4BF4F97999BC048A77", "Initial State File": "", - "Sequence File": "anyPercent.sol", + "Sequence File": "ninjaGaiden2.pacifist.sol", "Disable State Blocks": [ ] } diff --git a/tests/ninjaGaiden2/meson.build b/tests/ninjaGaiden2/meson.build deleted file mode 100644 index 7108fef..0000000 --- a/tests/ninjaGaiden2/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -game = 'ninjaGaiden2' - -goal = 'anyPercent' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) - -goal = 'pacifist' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file diff --git a/tests/novaTheSquirrel/anyPercent.sol b/tests/novaTheSquirrel.anyPercent.sol similarity index 100% rename from tests/novaTheSquirrel/anyPercent.sol rename to tests/novaTheSquirrel.anyPercent.sol diff --git a/tests/novaTheSquirrel/anyPercent.test b/tests/novaTheSquirrel.anyPercent.test similarity index 60% rename from tests/novaTheSquirrel/anyPercent.test rename to tests/novaTheSquirrel.anyPercent.test index 4c4a330..74d688f 100644 --- a/tests/novaTheSquirrel/anyPercent.test +++ b/tests/novaTheSquirrel.anyPercent.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/nova.nes", + "Rom File": "roms/nova.nes", "Expected ROM SHA1": "B6B07EE76492ED475F39167C89B342353F999231", "Initial State File": "", - "Sequence File": "anyPercent.sol", + "Sequence File": "novaTheSquirrel.anyPercent.sol", "Disable State Blocks": [ ] } diff --git a/tests/novaTheSquirrel/README.md b/tests/novaTheSquirrel/README.md deleted file mode 100644 index 5e1fe9f..0000000 --- a/tests/novaTheSquirrel/README.md +++ /dev/null @@ -1,7 +0,0 @@ -Nova The Squirrel is a open-source free game. This rom was obtained from -https://github.com/NovaSquirrel/NovaTheSquirrel -https://novasquirrel.itch.io/nova-the-squirrel - -We use the movie https://tasvideos.org/5246M by Cephla distributed under the CC2.0 license - - diff --git a/tests/novaTheSquirrel/meson.build b/tests/novaTheSquirrel/meson.build deleted file mode 100644 index 48d7cb4..0000000 --- a/tests/novaTheSquirrel/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -game = 'novaTheSquirrel' - -goal = 'anyPercent' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file diff --git a/tests/princeOfPersia/anyPercent.sol b/tests/princeOfPersia.anyPercent.sol similarity index 100% rename from tests/princeOfPersia/anyPercent.sol rename to tests/princeOfPersia.anyPercent.sol diff --git a/tests/princeOfPersia/anyPercent.test b/tests/princeOfPersia.anyPercent.test similarity index 55% rename from tests/princeOfPersia/anyPercent.test rename to tests/princeOfPersia.anyPercent.test index 0db346b..4c53d00 100644 --- a/tests/princeOfPersia/anyPercent.test +++ b/tests/princeOfPersia.anyPercent.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Prince of Persia (U) [!].nes", + "Rom File": "roms/Prince of Persia (U) [!].nes", "Expected ROM SHA1": "6B58F149F34FA829135619C58700CAAA95B9CDE3", "Initial State File": "", - "Sequence File": "anyPercent.sol", + "Sequence File": "princeOfPersia.anyPercent.sol", "Disable State Blocks": [ ] } diff --git a/tests/princeOfPersia/meson.build b/tests/princeOfPersia/meson.build deleted file mode 100644 index b92a1df..0000000 --- a/tests/princeOfPersia/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -game = 'princeOfPersia' - -goal = 'anyPercent' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file diff --git a/tests/saintSeiyaKanketsuHen/anyPercent.sol b/tests/saintSeiyaKanketsuHen.anyPercent.sol similarity index 100% rename from tests/saintSeiyaKanketsuHen/anyPercent.sol rename to tests/saintSeiyaKanketsuHen.anyPercent.sol diff --git a/tests/saintSeiyaKanketsuHen.anyPercent.test b/tests/saintSeiyaKanketsuHen.anyPercent.test new file mode 100644 index 0000000..22f14f9 --- /dev/null +++ b/tests/saintSeiyaKanketsuHen.anyPercent.test @@ -0,0 +1,7 @@ +{ + "Rom File": "roms/Saint Seiya - Ougon Densetsu Kanketsu Hen (J) [!].nes", + "Expected ROM SHA1": "F871D9B3DAFDDCDAD5F2ACD71044292E5169064E", + "Initial State File": "", + "Sequence File": "saintSeiyaKanketsuHen.anyPercent.sol", + "Disable State Blocks": [ ] +} diff --git a/tests/saintSeiyaKanketsuHen/anyPercent.test b/tests/saintSeiyaKanketsuHen/anyPercent.test deleted file mode 100644 index e6d287c..0000000 --- a/tests/saintSeiyaKanketsuHen/anyPercent.test +++ /dev/null @@ -1,7 +0,0 @@ -{ - "Rom File": "../roms/Saint Seiya - Ougon Densetsu Kanketsu Hen (J) [!].nes", - "Expected ROM SHA1": "F871D9B3DAFDDCDAD5F2ACD71044292E5169064E", - "Initial State File": "", - "Sequence File": "anyPercent.sol", - "Disable State Blocks": [ ] -} diff --git a/tests/saintSeiyaKanketsuHen/meson.build b/tests/saintSeiyaKanketsuHen/meson.build deleted file mode 100644 index afffb65..0000000 --- a/tests/saintSeiyaKanketsuHen/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -game = 'saintSeiyaKanketsuHen' - -goal = 'anyPercent' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file diff --git a/tests/saintSeiyaOugonDensetsu/anyPercent.sol b/tests/saintSeiyaOugonDensetsu.anyPercent.sol similarity index 100% rename from tests/saintSeiyaOugonDensetsu/anyPercent.sol rename to tests/saintSeiyaOugonDensetsu.anyPercent.sol diff --git a/tests/saintSeiyaOugonDensetsu/anyPercent.test b/tests/saintSeiyaOugonDensetsu.anyPercent.test similarity index 51% rename from tests/saintSeiyaOugonDensetsu/anyPercent.test rename to tests/saintSeiyaOugonDensetsu.anyPercent.test index 45aa8cc..1dd6000 100644 --- a/tests/saintSeiyaOugonDensetsu/anyPercent.test +++ b/tests/saintSeiyaOugonDensetsu.anyPercent.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Saint Seiya - Ougon Densetsu (J) [!].nes", + "Rom File": "roms/Saint Seiya - Ougon Densetsu (J) [!].nes", "Expected ROM SHA1": "3F3B499CF50386084E053BCA096AE8E52330CFAE", "Initial State File": "", - "Sequence File": "anyPercent.sol", + "Sequence File": "saintSeiyaKanketsuHen.anyPercent.sol", "Disable State Blocks": [ ] } diff --git a/tests/saintSeiyaOugonDensetsu/meson.build b/tests/saintSeiyaOugonDensetsu/meson.build deleted file mode 100644 index 148e817..0000000 --- a/tests/saintSeiyaOugonDensetsu/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -game = 'saintSeiyaOugonDensetsu' - -goal = 'anyPercent' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file diff --git a/tests/saiyuukiWorld/anyPercent.sol b/tests/saiyuukiWorld.anyPercent.sol similarity index 100% rename from tests/saiyuukiWorld/anyPercent.sol rename to tests/saiyuukiWorld.anyPercent.sol diff --git a/tests/saiyuukiWorld.anyPercent.test b/tests/saiyuukiWorld.anyPercent.test new file mode 100644 index 0000000..a900115 --- /dev/null +++ b/tests/saiyuukiWorld.anyPercent.test @@ -0,0 +1,7 @@ +{ + "Rom File": "roms/Saiyuuki World (J).nes", + "Expected ROM SHA1": "C2F12D915A4D0B1FFDF8A64AE1092CE6A2D08770", + "Initial State File": "", + "Sequence File": "saiyuukiWorld.anyPercent.sol", + "Disable State Blocks": [ ] +} diff --git a/tests/saiyuukiWorld/lastHalf.sol b/tests/saiyuukiWorld.lastHalf.sol similarity index 100% rename from tests/saiyuukiWorld/lastHalf.sol rename to tests/saiyuukiWorld.lastHalf.sol diff --git a/tests/saiyuukiWorld/lastHalf.state b/tests/saiyuukiWorld.lastHalf.state similarity index 100% rename from tests/saiyuukiWorld/lastHalf.state rename to tests/saiyuukiWorld.lastHalf.state diff --git a/tests/saiyuukiWorld.lastHalf.test b/tests/saiyuukiWorld.lastHalf.test new file mode 100644 index 0000000..d7dc1dd --- /dev/null +++ b/tests/saiyuukiWorld.lastHalf.test @@ -0,0 +1,7 @@ +{ + "Rom File": "roms/Saiyuuki World (J).nes", + "Expected ROM SHA1": "C2F12D915A4D0B1FFDF8A64AE1092CE6A2D08770", + "Initial State File": "saiyuukiWorld.lastHalf.state", + "Sequence File": "saiyuukiWorld.lastHalf.sol", + "Disable State Blocks": [ ] +} diff --git a/tests/saiyuukiWorld/anyPercent.test b/tests/saiyuukiWorld/anyPercent.test deleted file mode 100644 index d96367a..0000000 --- a/tests/saiyuukiWorld/anyPercent.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Rom File": "../roms/Saiyuuki World (J).nes", - "Expected ROM SHA1": "C2F12D915A4D0B1FFDF8A64AE1092CE6A2D08770", - "Initial State File": "", - "Sequence File": "anyPercent.sol", - "Disable State Blocks": [ ], - "Credits": "https://tasvideos.org/4422M by aiqiyou & J.Y" -} diff --git a/tests/saiyuukiWorld/lastHalf.test b/tests/saiyuukiWorld/lastHalf.test deleted file mode 100644 index ac5ef78..0000000 --- a/tests/saiyuukiWorld/lastHalf.test +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Rom File": "../roms/Saiyuuki World (J).nes", - "Expected ROM SHA1": "C2F12D915A4D0B1FFDF8A64AE1092CE6A2D08770", - "Initial State File": "lastHalf.state", - "Sequence File": "anyPercent.sol", - "Disable State Blocks": [ ], - "Credits": "https://tasvideos.org/4422M by aiqiyou & J.Y" -} diff --git a/tests/saiyuukiWorld/meson.build b/tests/saiyuukiWorld/meson.build deleted file mode 100644 index b582920..0000000 --- a/tests/saiyuukiWorld/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -game = 'saiyuukiWorld' - -bash = find_program('bash') - -goal = 'anyPercent' -test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) - -goal = 'lastHalf' -test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file diff --git a/tests/solarJetman/anyPercent.sol b/tests/solarJetman.anyPercent.sol similarity index 100% rename from tests/solarJetman/anyPercent.sol rename to tests/solarJetman.anyPercent.sol diff --git a/tests/solarJetman/anyPercent.test b/tests/solarJetman.anyPercent.test similarity index 50% rename from tests/solarJetman/anyPercent.test rename to tests/solarJetman.anyPercent.test index 352f02b..d047a5d 100644 --- a/tests/solarJetman/anyPercent.test +++ b/tests/solarJetman.anyPercent.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Solar Jetman - Hunt for the Golden Warpship (U) [!].nes", + "Rom File": "roms/Solar Jetman - Hunt for the Golden Warpship (U) [!].nes", "Expected ROM SHA1": "872B91A2F7A2F635061EF43F79E7F7E9F59F5C50", "Initial State File": "", - "Sequence File": "anyPercent.sol", + "Sequence File": "solarJetman.anyPercent.sol", "Disable State Blocks": [ ] } diff --git a/tests/solarJetman/meson.build b/tests/solarJetman/meson.build deleted file mode 100644 index f04eeea..0000000 --- a/tests/solarJetman/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -game = 'solarJetman' - -goal = 'anyPercent' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file diff --git a/tests/sprilo/anyPercent.sol b/tests/sprilo.anyPercent.sol similarity index 100% rename from tests/sprilo/anyPercent.sol rename to tests/sprilo.anyPercent.sol diff --git a/tests/sprilo/anyPercent.test b/tests/sprilo.anyPercent.test similarity index 62% rename from tests/sprilo/anyPercent.test rename to tests/sprilo.anyPercent.test index f1e28e7..648baa8 100644 --- a/tests/sprilo/anyPercent.test +++ b/tests/sprilo.anyPercent.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/sprilo.nes", + "Rom File": "roms/sprilo.nes", "Expected ROM SHA1": "6EC09B9B51320A536A786D3D4719432B714C5779", "Initial State File": "", - "Sequence File": "anyPercent.sol", + "Sequence File": "sprilo.anyPercent.sol", "Disable State Blocks": [ ] } diff --git a/tests/sprilo/README.md b/tests/sprilo/README.md deleted file mode 100644 index 3c804a0..0000000 --- a/tests/sprilo/README.md +++ /dev/null @@ -1,7 +0,0 @@ -Sprilo is a open-source free game. This rom was obtained from -https://itch.io/jam/game-off-2017 -https://github.com/cbrwn/gameoff - -We use the movie https://tasvideos.org/3557G by MrTASer distributed under the CC2.0 license - - diff --git a/tests/sprilo/meson.build b/tests/sprilo/meson.build deleted file mode 100644 index ce73c57..0000000 --- a/tests/sprilo/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -game = 'sprilo' - -goal = 'anyPercent' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file diff --git a/tests/superMarioBros/warpless.sol b/tests/superMarioBros.warpless.sol similarity index 100% rename from tests/superMarioBros/warpless.sol rename to tests/superMarioBros.warpless.sol diff --git a/tests/superMarioBros/warps.test b/tests/superMarioBros.warpless.test similarity index 55% rename from tests/superMarioBros/warps.test rename to tests/superMarioBros.warpless.test index 848e3ad..2c829d2 100644 --- a/tests/superMarioBros/warps.test +++ b/tests/superMarioBros.warpless.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Super Mario Bros. (W) [!].nes", + "Rom File": "roms/Super Mario Bros. (W) [!].nes", "Expected ROM SHA1": "EA343F4E445A9050D4B4FBAC2C77D0693B1D0922", "Initial State File": "", - "Sequence File": "warps.sol", + "Sequence File": "superMarioBros.warpless.sol", "Disable State Blocks": [ ] } diff --git a/tests/superMarioBros/warps.sol b/tests/superMarioBros.warps.sol similarity index 100% rename from tests/superMarioBros/warps.sol rename to tests/superMarioBros.warps.sol diff --git a/tests/superMarioBros/warpless.test b/tests/superMarioBros.warps.test similarity index 56% rename from tests/superMarioBros/warpless.test rename to tests/superMarioBros.warps.test index c8db3fc..d1ec25d 100644 --- a/tests/superMarioBros/warpless.test +++ b/tests/superMarioBros.warps.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Super Mario Bros. (W) [!].nes", + "Rom File": "roms/Super Mario Bros. (W) [!].nes", "Expected ROM SHA1": "EA343F4E445A9050D4B4FBAC2C77D0693B1D0922", "Initial State File": "", - "Sequence File": "warpless.sol", + "Sequence File": "superMarioBros.warps.sol", "Disable State Blocks": [ ] } diff --git a/tests/superMarioBros/README.md b/tests/superMarioBros/README.md deleted file mode 100644 index 89c5c38..0000000 --- a/tests/superMarioBros/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Movies used: - -https://tasvideos.org/1715M by HappyLee -https://tasvideos.org/3728M by HappyLee and Mars608 diff --git a/tests/superMarioBros/meson.build b/tests/superMarioBros/meson.build deleted file mode 100644 index bb448ce..0000000 --- a/tests/superMarioBros/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -game = 'superMarioBros' - -goal = 'warps' -test(goal, bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) - -goal = 'warpless' -test(goal, bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file diff --git a/tests/superMarioBros3/warps.sol b/tests/superMarioBros3.warps.sol similarity index 100% rename from tests/superMarioBros3/warps.sol rename to tests/superMarioBros3.warps.sol diff --git a/tests/superMarioBros3/warps.test b/tests/superMarioBros3.warps.test similarity index 54% rename from tests/superMarioBros3/warps.test rename to tests/superMarioBros3.warps.test index 519501c..f756b0f 100644 --- a/tests/superMarioBros3/warps.test +++ b/tests/superMarioBros3.warps.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Super Mario Bros. 3 (U) (PRG0) [!].nes", + "Rom File": "roms/Super Mario Bros. 3 (U) (PRG0) [!].nes", "Expected ROM SHA1": "A03E7E526E79DF222E048AE22214BCA2BC49C449", "Initial State File": "", - "Sequence File": "warps.sol", + "Sequence File": "superMarioBros3.warps.sol", "Disable State Blocks": [ ] } diff --git a/tests/superMarioBros3/meson.build b/tests/superMarioBros3/meson.build deleted file mode 100644 index a7a5e91..0000000 --- a/tests/superMarioBros3/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -game = 'superMarioBros3' - -goal = 'warps' -test(goal, bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file diff --git a/tests/superOffroad/anyPercent.sol b/tests/superOffroad.anyPercent.sol similarity index 100% rename from tests/superOffroad/anyPercent.sol rename to tests/superOffroad.anyPercent.sol diff --git a/tests/superOffroad/anyPercent.test b/tests/superOffroad.anyPercent.test similarity index 51% rename from tests/superOffroad/anyPercent.test rename to tests/superOffroad.anyPercent.test index 6f1dd17..d1e493d 100644 --- a/tests/superOffroad/anyPercent.test +++ b/tests/superOffroad.anyPercent.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Ivan 'Ironman' Stewart's Super Off Road (USA).nes", + "Rom File": "roms/Ivan 'Ironman' Stewart's Super Off Road (USA).nes", "Expected ROM SHA1": "57919B685B55EE3ED3AD98FB1D25626B98BE7D39", "Initial State File": "", - "Sequence File": "anyPercent.sol", + "Sequence File": "superOffroad.anyPercent.sol", "Disable State Blocks": [ ] } diff --git a/tests/superOffroad/meson.build b/tests/superOffroad/meson.build deleted file mode 100644 index 4c99566..0000000 --- a/tests/superOffroad/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -game = 'superOffroad' - -goal = 'anyPercent' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file diff --git a/tests/tennis/anyPercent.sol b/tests/tennis.anyPercent.sol similarity index 100% rename from tests/tennis/anyPercent.sol rename to tests/tennis.anyPercent.sol diff --git a/tests/tennis/anyPercent.test b/tests/tennis.anyPercent.test similarity index 60% rename from tests/tennis/anyPercent.test rename to tests/tennis.anyPercent.test index 12a3dad..4752506 100644 --- a/tests/tennis/anyPercent.test +++ b/tests/tennis.anyPercent.test @@ -1,7 +1,7 @@ { - "Rom File": "../roms/Tennis (JU) [!].nes", + "Rom File": "roms/Tennis (JU) [!].nes", "Expected ROM SHA1": "80D99C035E6A5AB9718E413EC25CBE094F085962", "Initial State File": "", - "Sequence File": "anyPercent.sol", + "Sequence File": "tennis.anyPercent.sol", "Disable State Blocks": [ ] } diff --git a/tests/tennis/meson.build b/tests/tennis/meson.build deleted file mode 100644 index 9861adf..0000000 --- a/tests/tennis/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -game = 'tennis' - -goal = 'anyPercent' -test(goal, bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--cycleType', 'Full'], suite: [ game, goal ] ) \ No newline at end of file