Skip to content
Snippets Groups Projects
Commit bf7bd4b7 authored by Vivian Roest's avatar Vivian Roest :gay_pride_flag:
Browse files

reordered tests

parent db7bba50
Branches
No related tags found
No related merge requests found
...@@ -1031,7 +1031,7 @@ dependencies = [ ...@@ -1031,7 +1031,7 @@ dependencies = [
[[package]] [[package]]
name = "tudelft-nes-test" name = "tudelft-nes-test"
version = "1.1.2" version = "1.1.3"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"log", "log",
... ...
......
[package] [package]
name = "tudelft-nes-test" name = "tudelft-nes-test"
version = "1.1.2" version = "1.1.3"
edition = "2021" edition = "2021"
authors = [ authors = [
"Victor Roest <victor@xirion.net>", "Victor Roest <victor@xirion.net>",
... ...
......
...@@ -56,21 +56,23 @@ impl Default for TestSelector { ...@@ -56,21 +56,23 @@ impl Default for TestSelector {
/// The main function of this crate, run this with your CPU as generic parameter and a [`TestSelector`] to run the tests /// The main function of this crate, run this with your CPU as generic parameter and a [`TestSelector`] to run the tests
pub fn run_tests<T: TestableCpu>(selector: TestSelector) -> Result<(), String> { pub fn run_tests<T: TestableCpu>(selector: TestSelector) -> Result<(), String> {
if selector.contains(TestSelector::ALL_INSTRS) { if selector.contains(TestSelector::NROM_TEST) {
all_instrs::<T>(false)?; nrom_test::<T>()?;
} }
if selector.contains(TestSelector::OFFICIAL_INSTRS) { if selector.contains(TestSelector::OFFICIAL_INSTRS) {
all_instrs::<T>(true)?; all_instrs::<T>(true)?;
} }
if selector.contains(TestSelector::ALL_INSTRS) {
all_instrs::<T>(false)?;
}
if selector.contains(TestSelector::NESTEST) { if selector.contains(TestSelector::NESTEST) {
nestest::<T>()?; nestest::<T>()?;
} }
if selector.contains(TestSelector::NROM_TEST) {
nrom_test::<T>()?;
}
Ok(()) Ok(())
} }
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment