From bf7bd4b7759ffa74b8d67b7671dd741f55429491 Mon Sep 17 00:00:00 2001
From: victor <victor@xirion.net>
Date: Tue, 4 Oct 2022 14:36:48 +0200
Subject: [PATCH] reordered tests
---
Cargo.lock | 2 +-
Cargo.toml | 2 +-
src/lib.rs | 12 +++++++-----
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 926188a..952dfb1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1031,7 +1031,7 @@ dependencies = [
[[package]]
name = "tudelft-nes-test"
-version = "1.1.2"
+version = "1.1.3"
dependencies = [
"bitflags",
"log",
diff --git a/Cargo.toml b/Cargo.toml
index 9184977..5eed20b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tudelft-nes-test"
-version = "1.1.2"
+version = "1.1.3"
edition = "2021"
authors = [
"Victor Roest <victor@xirion.net>",
diff --git a/src/lib.rs b/src/lib.rs
index 85c7195..d430c2e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -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
pub fn run_tests<T: TestableCpu>(selector: TestSelector) -> Result<(), String> {
- if selector.contains(TestSelector::ALL_INSTRS) {
- all_instrs::<T>(false)?;
+ if selector.contains(TestSelector::NROM_TEST) {
+ nrom_test::<T>()?;
}
if selector.contains(TestSelector::OFFICIAL_INSTRS) {
all_instrs::<T>(true)?;
}
+ if selector.contains(TestSelector::ALL_INSTRS) {
+ all_instrs::<T>(false)?;
+ }
+
if selector.contains(TestSelector::NESTEST) {
nestest::<T>()?;
}
- if selector.contains(TestSelector::NROM_TEST) {
- nrom_test::<T>()?;
- }
+
Ok(())
}
--
GitLab