More tests

Signed-off-by: Andrea Zoppi <texzk@email.it>
TexZK · Mar 14, 2024 · 805ff60 · 805ff60
1 parent 0d075ae
commit 805ff60
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/aymo_score_dro.c b/src/aymo_score_dro.c
@@ -293,11 +293,11 @@ static void aymo_score_dro_decode_v2(
     const uint8_t* ptr = &(score->events[score->offset]);
 
     if (ptr[0] == v2_header->short_delay_code) {
-        score->status.delay = (ptr[1] + 1uL);
+        score->status.delay = ((ptr[1] + 1uL) * score->division);
         score->status.flags = AYMO_SCORE_FLAG_DELAY;
     }
     else if (ptr[0] == v2_header->long_delay_code) {
-        score->status.delay = ((ptr[1] + 1uL) * 256u);
+        score->status.delay = (((ptr[1] + 1uL) * 256u) * score->division);
         score->status.flags = AYMO_SCORE_FLAG_DELAY;
     }
     else if ((ptr[0] & 0xFFu) < v2_header->codemap_length) {

diff --git a/tests/meson.build b/tests/meson.build
@@ -383,7 +383,12 @@ endforeach
 
 # [[format, path], ...]
 aymo_ymf262_compare_suite = [
+#  ['raw', '../contrib/adplug/test/testmus/crusader.raw'],
+  ['dro', '../contrib/adplug/test/testmus/doofus.dro'],
+  ['dro', '../contrib/adplug/test/testmus/dro_v2.dro'],
+#  ['raw', '../contrib/adplug/test/testmus/inc.raw'],
   ['dro', '../contrib/adplug/test/testmus/samurai.dro'],
+  ['imf', '../contrib/adplug/test/testmus/WONDERIN.WLF'],
 ]
 
 foreach intr_name : ['none', 'x86_sse41', 'x86_avx2', 'arm_neon']
@@ -393,9 +398,7 @@ foreach intr_name : ['none', 'x86_sse41', 'x86_avx2', 'arm_neon']
     test_suite = 'test_ymf262_@0@_compare'.format(intr_name)
     test_exe = get_variable('@0@_exe'.format(test_suite))
     foreach test_args : aymo_ymf262_compare_suite
-      score_type = test_args[0]
-      score_path = test_args[1]
-      test_name = ('_'.join([test_suite, fs.name(score_path)])).underscorify()
+      test_name = ('_'.join([test_suite, fs.name(test_args[1])])).underscorify()
       test(test_name, test_exe, args: test_args)
     endforeach
   endif