1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 08:49:37 +00:00

Merge pull request #884 from MaddTheSane/master

Minor pokes to the test files code.
This commit is contained in:
Thomas Harte 2021-03-19 08:40:16 -04:00 committed by GitHub
commit b3fc64d4f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -43,7 +43,7 @@
// Issue each test file. // Issue each test file.
for(NSURL *url in tests) { for(NSURL *url in tests) {
// Compare against a file set if one has been supplied. // Compare against a file set if one has been supplied.
if(_fileSet && ![_fileSet containsObject:[[url path] lastPathComponent]]) continue; if(_fileSet && ![_fileSet containsObject:[url lastPathComponent]]) continue;
NSLog(@"Testing %@", url); NSLog(@"Testing %@", url);
[self testJSONAtURL:url]; [self testJSONAtURL:url];
} }

View File

@ -107,7 +107,7 @@ class EmuTOS: public ComparativeBusHandler {
const std::vector<ROMMachine::ROM> rom_names = {{"AtariST", "", image.UTF8String, 0, 0 }}; const std::vector<ROMMachine::ROM> rom_names = {{"AtariST", "", image.UTF8String, 0, 0 }};
const auto roms = CSROMFetcher()(rom_names); const auto roms = CSROMFetcher()(rom_names);
NSString *const traceLocation = [[NSBundle bundleForClass:[self class]] pathForResource:trace ofType:@"trace.txt.gz"]; NSString *const traceLocation = [[NSBundle bundleForClass:[self class]] pathForResource:trace ofType:@"trace.txt.gz"];
_machine = std::make_unique<EmuTOS>(*roms[0], traceLocation.UTF8String); _machine = std::make_unique<EmuTOS>(*roms[0], traceLocation.fileSystemRepresentation);
_machine->run_for(HalfCycles(length)); _machine->run_for(HalfCycles(length));
} }