Move submodules to project root
This commit is contained in:
parent
89f66c3d5b
commit
83cc35c968
6
.gitmodules
vendored
6
.gitmodules
vendored
@ -1,6 +1,6 @@
|
||||
[submodule "tests/chip8-test-suite"]
|
||||
path = tests/chip8-test-suite
|
||||
[submodule "chip8-test-suite"]
|
||||
path = chip8-test-suite
|
||||
url = https://github.com/Timendus/chip8-test-suite.git
|
||||
[submodule "chip8Archive"]
|
||||
path = chip8Archive
|
||||
url = https://github.com/JohnEarnest/chip8Archive.git
|
||||
url = https://github.com/JohnEarnest/chip8Archive.git
|
@ -37,7 +37,7 @@ fn setup_environment() -> (CPU, Bus) {
|
||||
// Load the ROM file into RAM (dummy binary which contains nothing but `jmp pc+2`)
|
||||
Program [0x0200..0x1000] = include_bytes!("tests/roms/jumptest.ch8"),
|
||||
// Create a screen
|
||||
Screen [0x0F00..0x1000] = include_bytes!("../../tests/chip8Archive/roms/1dcell.ch8"),
|
||||
Screen [0x0F00..0x1000] = include_bytes!("../../chip8Archive/roms/1dcell.ch8"),
|
||||
},
|
||||
)
|
||||
}
|
||||
|
@ -16,9 +16,9 @@ fn setup_environment() -> (CPU, Bus) {
|
||||
// Load the charset into ROM
|
||||
Charset [0x0050..0x00A0] = include_bytes!("../src/mem/charset.bin"),
|
||||
// Load the ROM file into RAM
|
||||
Program [0x0200..0x1000] = include_bytes!("../chip-8/BC_test.ch8"),
|
||||
// Create a screen
|
||||
Screen [0x0F00..0x1000] = include_bytes!("../chip-8/IBM Logo.ch8"),
|
||||
Program [0x0200..0x1000] = include_bytes!("../chip8-test-suite/bin/chip8-test-suite.ch8"),
|
||||
// Create a screen, and fill it with garbage data
|
||||
Screen [0x0F00..0x1000] = include_bytes!("chip8_test_suite.rs"),
|
||||
},
|
||||
)
|
||||
}
|
||||
@ -45,14 +45,14 @@ fn run_screentest(test: SuiteTest, mut cpu: CPU, mut bus: Bus) {
|
||||
|
||||
#[test]
|
||||
fn splash_screen() {
|
||||
let (c, b) = setup_environment();
|
||||
let (cpu, bus) = setup_environment();
|
||||
run_screentest(
|
||||
SuiteTest {
|
||||
program: include_bytes!("chip8-test-suite/bin/chip8-test-suite.ch8"),
|
||||
screen: include_bytes!("screens/chip8-test-suite/splash.bin"),
|
||||
},
|
||||
c,
|
||||
b,
|
||||
cpu,
|
||||
bus,
|
||||
)
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user