diff --git a/tests/cpu/jsmoo/testdata/disabled/80.json b/tests/cpu/jsmoo/testdata/80.json similarity index 100% rename from tests/cpu/jsmoo/testdata/disabled/80.json rename to tests/cpu/jsmoo/testdata/80.json diff --git a/tests/cpu/jsmoo/testdata/disabled/81.json b/tests/cpu/jsmoo/testdata/81.json similarity index 100% rename from tests/cpu/jsmoo/testdata/disabled/81.json rename to tests/cpu/jsmoo/testdata/81.json diff --git a/tests/cpu/jsmoo/testdata/disabled/82.json b/tests/cpu/jsmoo/testdata/82.json similarity index 100% rename from tests/cpu/jsmoo/testdata/disabled/82.json rename to tests/cpu/jsmoo/testdata/82.json diff --git a/tests/cpu/jsmoo/testdata/disabled/83.json b/tests/cpu/jsmoo/testdata/83.json similarity index 100% rename from tests/cpu/jsmoo/testdata/disabled/83.json rename to tests/cpu/jsmoo/testdata/83.json diff --git a/tests/cpu/jsmoo/testdata/disabled/84.json b/tests/cpu/jsmoo/testdata/84.json similarity index 100% rename from tests/cpu/jsmoo/testdata/disabled/84.json rename to tests/cpu/jsmoo/testdata/84.json diff --git a/tests/cpu/jsmoo/testdata/disabled/85.json b/tests/cpu/jsmoo/testdata/85.json similarity index 100% rename from tests/cpu/jsmoo/testdata/disabled/85.json rename to tests/cpu/jsmoo/testdata/85.json diff --git a/tests/cpu/jsmoo/testdata/disabled/86.json b/tests/cpu/jsmoo/testdata/86.json similarity index 100% rename from tests/cpu/jsmoo/testdata/disabled/86.json rename to tests/cpu/jsmoo/testdata/86.json diff --git a/tests/cpu/jsmoo/testdata/disabled/87.json b/tests/cpu/jsmoo/testdata/87.json similarity index 100% rename from tests/cpu/jsmoo/testdata/disabled/87.json rename to tests/cpu/jsmoo/testdata/87.json diff --git a/tests/cpu/jsmoo/testdata/disabled/88.json b/tests/cpu/jsmoo/testdata/88.json similarity index 100% rename from tests/cpu/jsmoo/testdata/disabled/88.json rename to tests/cpu/jsmoo/testdata/88.json diff --git a/tests/cpu/jsmoo/testdata/disabled/89.json b/tests/cpu/jsmoo/testdata/89.json similarity index 100% rename from tests/cpu/jsmoo/testdata/disabled/89.json rename to tests/cpu/jsmoo/testdata/89.json diff --git a/tests/cpu/jsmoo/testdata/disabled/8a.json b/tests/cpu/jsmoo/testdata/8a.json similarity index 100% rename from tests/cpu/jsmoo/testdata/disabled/8a.json rename to tests/cpu/jsmoo/testdata/8a.json diff --git a/tests/cpu/jsmoo/testdata/disabled/8b.json b/tests/cpu/jsmoo/testdata/8b.json similarity index 100% rename from tests/cpu/jsmoo/testdata/disabled/8b.json rename to tests/cpu/jsmoo/testdata/8b.json diff --git a/tests/cpu/jsmoo/testdata/disabled/8c.json b/tests/cpu/jsmoo/testdata/8c.json similarity index 100% rename from tests/cpu/jsmoo/testdata/disabled/8c.json rename to tests/cpu/jsmoo/testdata/8c.json diff --git a/tests/cpu/jsmoo/testdata/disabled/8d.json b/tests/cpu/jsmoo/testdata/8d.json similarity index 100% rename from tests/cpu/jsmoo/testdata/disabled/8d.json rename to tests/cpu/jsmoo/testdata/8d.json diff --git a/tests/cpu/jsmoo/testdata/disabled/e0.json b/tests/cpu/jsmoo/testdata/e0.json similarity index 100% rename from tests/cpu/jsmoo/testdata/disabled/e0.json rename to tests/cpu/jsmoo/testdata/e0.json diff --git a/tests/cpu/jsmoo/testdata/disabled/e2.json b/tests/cpu/jsmoo/testdata/e2.json similarity index 100% rename from tests/cpu/jsmoo/testdata/disabled/e2.json rename to tests/cpu/jsmoo/testdata/e2.json diff --git a/tests/cpu/jsmoo/testdata/disabled/f0.json b/tests/cpu/jsmoo/testdata/f0.json similarity index 100% rename from tests/cpu/jsmoo/testdata/disabled/f0.json rename to tests/cpu/jsmoo/testdata/f0.json diff --git a/tests/cpu/jsmoo/testdata/disabled/f2.json b/tests/cpu/jsmoo/testdata/f2.json similarity index 100% rename from tests/cpu/jsmoo/testdata/disabled/f2.json rename to tests/cpu/jsmoo/testdata/f2.json diff --git a/tests/cpu/testutil.rs b/tests/cpu/testutil.rs index d8795aa..41447d3 100644 --- a/tests/cpu/testutil.rs +++ b/tests/cpu/testutil.rs @@ -1,17 +1,17 @@ use ferris_boi::{cpu::Processor, register}; macro_rules! assert_flags_eq { - ($processor: expr, $(($flag: path, $value: expr)),+ $(,)?) => { - $( - assert_eq!( - $value, - $processor.registers.get_flag_bit($flag), - "{:?} flag had unexpected value", - $flag - ); - )+ - }; - } + ($processor: expr, $(($flag: path, $value: expr)),+ $(,)?) => { + $( + assert_eq!( + $value, + $processor.registers.get_flag_bit($flag), + "{:?} flag had unexpected value", + $flag + ); + )+ + }; +} pub(crate) use assert_flags_eq;