Extending full cycle testing to an extra advance
This commit is contained in:
parent
4afe5e9f02
commit
e09e0a745d
|
@ -117,7 +117,7 @@ int main(int argc, char *argv[])
|
||||||
// Printing test information
|
// Printing test information
|
||||||
printf("[] -----------------------------------------\n");
|
printf("[] -----------------------------------------\n");
|
||||||
printf("[] Running Script: '%s'\n", scriptFilePath.c_str());
|
printf("[] Running Script: '%s'\n", scriptFilePath.c_str());
|
||||||
printf("[] Cycle Type: '%s'\n", isFullCycle ? "Load / Advance / Save" : "Advance Only");
|
printf("[] Cycle Type: '%s'\n", isFullCycle ? "Load / Advance / Save / Advance" : "Advance Only");
|
||||||
printf("[] Emulation Core: '%s'\n", emulationCoreName.c_str());
|
printf("[] Emulation Core: '%s'\n", emulationCoreName.c_str());
|
||||||
printf("[] ROM File: '%s'\n", romFilePath.c_str());
|
printf("[] ROM File: '%s'\n", romFilePath.c_str());
|
||||||
printf("[] ROM SHA1: '%s'\n", romSHA1.c_str());
|
printf("[] ROM SHA1: '%s'\n", romSHA1.c_str());
|
||||||
|
@ -140,6 +140,7 @@ int main(int argc, char *argv[])
|
||||||
if (isFullCycle == true) e.deserializeState(currentState);
|
if (isFullCycle == true) e.deserializeState(currentState);
|
||||||
e.advanceState(input);
|
e.advanceState(input);
|
||||||
if (isFullCycle == true) e.serializeState(currentState);
|
if (isFullCycle == true) e.serializeState(currentState);
|
||||||
|
if (isFullCycle == true) e.advanceState(input);
|
||||||
}
|
}
|
||||||
auto tf = std::chrono::high_resolution_clock::now();
|
auto tf = std::chrono::high_resolution_clock::now();
|
||||||
|
|
||||||
|
|
|
@ -3,9 +3,7 @@ game = 'arkanoid'
|
||||||
bash = find_program('bash')
|
bash = find_program('bash')
|
||||||
|
|
||||||
goal = 'warpless'
|
goal = 'warpless'
|
||||||
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
||||||
test(goal, bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test'], suite: [ game, goal ] )
|
|
||||||
|
|
||||||
goal = 'warps'
|
goal = 'warps'
|
||||||
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
||||||
test(goal, bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test'], suite: [ game, goal ] )
|
|
|
@ -1,5 +1,4 @@
|
||||||
game = 'galaga'
|
game = 'galaga'
|
||||||
|
|
||||||
goal = 'anyPercent'
|
goal = 'anyPercent'
|
||||||
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
||||||
test(goal, bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test'], suite: [ game, goal ] )
|
|
|
@ -1,5 +1,4 @@
|
||||||
game = 'ironSword'
|
game = 'ironSword'
|
||||||
|
|
||||||
goal = 'anyPercent'
|
goal = 'anyPercent'
|
||||||
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
||||||
test(goal, bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test'], suite: [ game, goal ] )
|
|
|
@ -2,6 +2,7 @@ nomalloc = environment({'MALLOC_PERTURB_': '0'})
|
||||||
|
|
||||||
bash = find_program('bash')
|
bash = find_program('bash')
|
||||||
testCommands = ['../run_test.sh', quickerNESTester.path(), quickNESTester.path() ]
|
testCommands = ['../run_test.sh', quickerNESTester.path(), quickNESTester.path() ]
|
||||||
|
testTimeout = 120
|
||||||
|
|
||||||
subdir('arkanoid')
|
subdir('arkanoid')
|
||||||
subdir('castlevania1')
|
subdir('castlevania1')
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
game = 'nigelMansell'
|
game = 'nigelMansell'
|
||||||
|
|
||||||
goal = 'anyPercent'
|
goal = 'anyPercent'
|
||||||
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: 60, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
||||||
test(goal, bash, workdir : meson.current_source_dir(), timeout: 60, args : [ testCommands, goal + '.test'], suite: [ game, goal ] )
|
|
|
@ -1,9 +1,7 @@
|
||||||
game = 'ninjaGaiden'
|
game = 'ninjaGaiden'
|
||||||
|
|
||||||
goal = 'anyPercent'
|
goal = 'anyPercent'
|
||||||
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: 60, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
||||||
test(goal, bash, workdir : meson.current_source_dir(), timeout: 60, args : [ testCommands, goal + '.test'], suite: [ game, goal ] )
|
|
||||||
|
|
||||||
goal = 'pacifist'
|
goal = 'pacifist'
|
||||||
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: 60, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
||||||
test(goal, bash, workdir : meson.current_source_dir(), timeout: 60, args : [ testCommands, goal + '.test'], suite: [ game, goal ] )
|
|
|
@ -1,9 +1,7 @@
|
||||||
game = 'ninjaGaiden2'
|
game = 'ninjaGaiden2'
|
||||||
|
|
||||||
goal = 'anyPercent'
|
goal = 'anyPercent'
|
||||||
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: 60, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
||||||
test(goal, bash, workdir : meson.current_source_dir(), timeout: 60, args : [ testCommands, goal + '.test'], suite: [ game, goal ] )
|
|
||||||
|
|
||||||
goal = 'pacifist'
|
goal = 'pacifist'
|
||||||
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: 60, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
||||||
test(goal, bash, workdir : meson.current_source_dir(), timeout: 60, args : [ testCommands, goal + '.test'], suite: [ game, goal ] )
|
|
File diff suppressed because it is too large
Load Diff
|
@ -2,5 +2,5 @@
|
||||||
"Rom File": "Prince of Persia (U) [!].nes",
|
"Rom File": "Prince of Persia (U) [!].nes",
|
||||||
"Expected ROM SHA1": "6B58F149F34FA829135619C58700CAAA95B9CDE3",
|
"Expected ROM SHA1": "6B58F149F34FA829135619C58700CAAA95B9CDE3",
|
||||||
"Initial State File": "",
|
"Initial State File": "",
|
||||||
"Sequence File": "lvl3_glitch.sol"
|
"Sequence File": "anyPercent.sol"
|
||||||
}
|
}
|
File diff suppressed because it is too large
Load Diff
|
@ -1,5 +1,4 @@
|
||||||
game = 'princeOfPersia'
|
game = 'princeOfPersia'
|
||||||
|
|
||||||
goal = 'lvl3_glitch'
|
goal = 'anyPercent'
|
||||||
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
||||||
test(goal, bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test'], suite: [ game, goal ] )
|
|
|
@ -1,5 +1,4 @@
|
||||||
game = 'saintSeiyaKanketsuHen'
|
game = 'saintSeiyaKanketsuHen'
|
||||||
|
|
||||||
goal = 'anyPercent'
|
goal = 'anyPercent'
|
||||||
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
||||||
test(goal, bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test'], suite: [ game, goal ] )
|
|
|
@ -1,5 +1,4 @@
|
||||||
game = 'saintSeiyaOugonDensetsu'
|
game = 'saintSeiyaOugonDensetsu'
|
||||||
|
|
||||||
goal = 'anyPercent'
|
goal = 'anyPercent'
|
||||||
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
||||||
test(goal, bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test'], suite: [ game, goal ] )
|
|
|
@ -1,5 +1,4 @@
|
||||||
game = 'solarJetman'
|
game = 'solarJetman'
|
||||||
|
|
||||||
goal = 'anyPercent'
|
goal = 'anyPercent'
|
||||||
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
||||||
test(goal, bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test'], suite: [ game, goal ] )
|
|
|
@ -1,5 +1,4 @@
|
||||||
game = 'superOffroad'
|
game = 'superOffroad'
|
||||||
|
|
||||||
goal = 'anyPercent'
|
goal = 'anyPercent'
|
||||||
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: 60, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
||||||
test(goal, bash, workdir : meson.current_source_dir(), timeout: 60, args : [ testCommands, goal + '.test'], suite: [ game, goal ] )
|
|
|
@ -1,5 +1,4 @@
|
||||||
game = 'tennis'
|
game = 'tennis'
|
||||||
|
|
||||||
goal = 'anyPercent'
|
goal = 'anyPercent'
|
||||||
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
test(goal + '-FullCycle', bash, workdir : meson.current_source_dir(), timeout: testTimeout, args : [ testCommands, goal + '.test', '--fullCycle'], suite: [ game, goal ] )
|
||||||
test(goal, bash, workdir : meson.current_source_dir(), args : [ testCommands, goal + '.test'], suite: [ game, goal ] )
|
|
Loading…
Reference in New Issue