Adapt to stricter nihtest.

nih-at · Dec 17, 2024 · 6960a88 · 6960a88
1 parent bf139b9
commit 6960a88
Show file tree

Hide file tree

Showing 74 changed files with 74 additions and 3 deletions.
diff --git a/regress/baddump.vtest b/regress/baddump.vtest
@@ -6,6 +6,7 @@ file extra/baddump.zip baddump.zip {}
 file roms/.ckmame.db {} <inline.ckmamedb>
 hashes baddump.zip bad.rom cheap
 end-of-inline-data
+directory extra <> <>
 stdout
 In game baddump:
 game baddump                                 : correct

diff --git a/regress/ckmame-all-sets-2.vtest b/regress/ckmame-all-sets-2.vtest
@@ -8,6 +8,8 @@ file extra/1-4.zip 1-4-ok.zip {}
 file extra2/1-8.zip 1-8-ok.zip {}
 file roms1/.ckmame.db {} <empty.ckmamedb>
 file roms2/.ckmame.db {} <empty.ckmamedb>
+directory extra <> <>
+directory extra2 <> <>
 file .ckmamerc <inline>
 [global]
 report-correct = true

diff --git a/regress/ckmame-all-sets-3.zip.test b/regress/ckmame-all-sets-3.zip.test
@@ -15,6 +15,7 @@ file extra3/.ckmame.db {} <empty.ckmamedb-unzipped>
 file roms1/.ckmame.db {} <empty.ckmamedb>
 file roms3/.ckmame.db {} <empty.ckmamedb>
 file roms4/.ckmame.db {} <empty.ckmamedb-unzipped>
+directory roms2 {} <>
 file .ckmamerc <inline>
 [global]
 report-correct = true

diff --git a/regress/ckmame-complete-list.vtest b/regress/ckmame-complete-list.vtest
@@ -7,3 +7,4 @@ baddump
 nogood
 norom
 end-of-inline-data
+directory roms {} <>
diff --git a/regress/ckmame-dont-update-database.vtest b/regress/ckmame-dont-update-database.vtest
@@ -9,6 +9,7 @@ dat-directories = [ "dats" ]
 dats = [ "ckmame test db" ]
 rom-db = "output.db"
 end-of-inline-data
+directory roms {} <>
 stdout
 In game 1-4:
 game 1-4                                     : not a single file found

diff --git a/regress/ckmame-game-list.vtest b/regress/ckmame-game-list.vtest
@@ -5,6 +5,7 @@ file mame.db mame.db
 file gamelist <inline>
 1-4
 end-of-inline-data
+directory roms {} <>
 stdout
 In game 1-4:
 game 1-4                                     : not a single file found

diff --git a/regress/ckmame-missing-list.vtest b/regress/ckmame-missing-list.vtest
@@ -3,3 +3,4 @@ return 0
 arguments --missing-list missing-list --no-report-missing
 file mame.db mame.db
 file missing-list missing-list.txt
+directory roms {} <>
diff --git a/regress/ckmame-only-if-database-updated-1.vtest b/regress/ckmame-only-if-database-updated-1.vtest
@@ -11,6 +11,7 @@ dat-directories = [ "dats" ]
 dats = [ "ckmame test db" ]
 rom-db = "output.db"
 end-of-inline-data
+directory roms {} <>
 stdout
 ckmame test db (1 -> 2)
 In game 1-4:

diff --git a/regress/ckmame-update-database-1.vtest b/regress/ckmame-update-database-1.vtest
@@ -11,6 +11,7 @@ dat-directories = [ "dats" ]
 dats = [ "ckmame test db" ]
 rom-db = "output.db"
 end-of-inline-data
+directory roms {} <>
 stdout
 ckmame test db (1 -> 2)
 In game 1-4:

diff --git a/regress/ckmame-update-database-2.vtest b/regress/ckmame-update-database-2.vtest
@@ -11,6 +11,7 @@ dat-directories = [ "dats" ]
 dats = [ "ckmame test db" ]
 rom-db = "output.db"
 end-of-inline-data
+directory roms {} <>
 stdout
 In game 1-4:
 game 1-4                                     : not a single file found

diff --git a/regress/ckmame.vtest b/regress/ckmame.vtest
@@ -2,3 +2,4 @@ description test nothing to do, just check if ckmame runs
 return 0
 file mame.db mame.db
 arguments --no-report-missing
+directory roms {} <>
diff --git a/regress/ckmamedb-migrate-v2.zip.test b/regress/ckmamedb-migrate-v2.zip.test
@@ -6,6 +6,7 @@ file mame.db mame.db
 file extra/1-8.zip 1-8-ok.zip
 set-modification-time extra/1-8.zip 1715349226
 file extra/.ckmame.db 1-8-ok-v2-ckmame.db 1-8-ok-v2-migrated.ckmamedb-dump
+directory roms {} <>
 stdout
 In game 1-4:
 game 1-4                                     : not a single file found

diff --git a/regress/config-complete-games-only.vtest b/regress/config-complete-games-only.vtest
@@ -9,6 +9,7 @@ file .ckmamerc <inline>
 [global]
 complete-games-only = true
 end-of-inline-data
+directory roms {} <>
 stdout
 In game 2-48:
 game 2-48                                    : incomplete

diff --git a/regress/config-create-fixdat.vtest b/regress/config-create-fixdat.vtest
@@ -8,6 +8,7 @@ file .ckmamerc <inline>
 [global]
 create-fixdat = true
 end-of-inline-data
+directory roms {} <>
 stdout
 In game grandparent:
 game grandparent                             : not a single file found

diff --git a/regress/config-fixdat-directory.vtest b/regress/config-fixdat-directory.vtest
@@ -12,6 +12,7 @@ file .ckmamerc <>
 create-fixdat = true
 fixdat-directory = "home"
 end-of-inline-data
+directory roms {} <>
 stdout
 In game grandparent:
 game grandparent                             : not a single file found

diff --git a/regress/config-move-from-extra-2.vtest b/regress/config-move-from-extra-2.vtest
@@ -14,6 +14,7 @@ file .ckmamerc <inline>
 "search" = { "move-from-extra" = false }
 "extra" = { "move-from-extra" = true }
 end-of-inline-data
+directory extra <> <>
 stdout
 In game 2-48:
 rom  04.rom        size       4  crc d87f7e0c: is in 'search/1-4.zip/04.rom'

diff --git a/regress/config-move-from-extra.vtest b/regress/config-move-from-extra.vtest
@@ -9,6 +9,7 @@ file .ckmamerc <inline>
 [global]
 move-from-extra = true
 end-of-inline-data
+directory search <> <>
 stdout
 In game 1-4:
 rom  04.rom        size       4  crc d87f7e0c: is in 'search/14.zip/04.rom'

diff --git a/regress/config-no-create-fixdat.vtest b/regress/config-no-create-fixdat.vtest
@@ -5,6 +5,7 @@ file .ckmamerc <inline>
 [global]
 create-fixdat = false
 end-of-inline-data
+directory roms {} <>
 stdout
 In game grandparent:
 game grandparent                             : not a single file found

diff --git a/regress/config-rom-db.vtest b/regress/config-rom-db.vtest
@@ -5,6 +5,7 @@ file .ckmamerc <inline>
 [global]
 rom-db = "../mamedb-merge-parent.db"
 end-of-inline-data
+directory roms {} <>
 stdout
 In game grandparent:
 game grandparent                             : not a single file found

diff --git a/regress/delete-unknown-pattern-superfluous.vtest b/regress/delete-unknown-pattern-superfluous.vtest
@@ -2,6 +2,7 @@ description test single-rom game (no parent), superfluous file matches delete-un
 return 0
 arguments --no-status-db -Fvc --delete-unknown-pattern garb* -D ../mamedb-lost-parent-ok.db
 file roms/unknown.zip garbage.zip {}
+directory roms <> <>
 stdout
 In game clone-8:
 game clone-8                                 : not a single file found

diff --git a/regress/detector-from-extra-cleanup-no-header.vtest b/regress/detector-from-extra-cleanup-no-header.vtest
@@ -9,6 +9,7 @@ hashes 1-8.zip * cheap
 detector-hashes skip-some-bytes 20070429 1-8.zip *
 end-of-inline-data
 arguments --no-status-db -D mame-detector.db -Fvc -je extra
+directory extra <> <>
 stdout
 In game 1-8:
 game 1-8                                     : correct

diff --git a/regress/detector-from-extra-cleanup.vtest b/regress/detector-from-extra-cleanup.vtest
@@ -9,6 +9,7 @@ hashes 1-8.zip * cheap
 detector-hashes skip-some-bytes 20070429 1-8.zip *
 end-of-inline-data
 arguments -D mame-detector.db -Fvc -je extra 1-8
+directory extra <> <>
 stdout
 In game 1-8:
 game 1-8                                     : correct

diff --git a/regress/detector-from-extra.vtest b/regress/detector-from-extra.vtest
@@ -9,6 +9,7 @@ hashes 1-8.zip * cheap
 detector-hashes skip-some-bytes 20070429 1-8.zip *
 end-of-inline-data
 arguments -D mame-detector.db -Fvc -je extra 1-8
+directory extra <> <>
 stdout
 In game 1-8:
 rom  08.rom        size       8  crc 3656897d: is in 'extra/1-8-header.zip/08.rom'

diff --git a/regress/disk-fixdat.zip.test b/regress/disk-fixdat.zip.test
@@ -3,6 +3,7 @@ description test single-rom game with disk, missing disk in fixdat
 return 0
 arguments --no-status-db -Fvj -D ../mamedb-disk.db --create-fixdat
 file "fixdat_game-with-disk (1).dat" {} disk-fixdat.fixdat
+directory roms {} <>
 stdout
 In game disk:
 game disk                                    : not a single file found

diff --git a/regress/disk-from-extra-remove.zip.test b/regress/disk-from-extra-remove.zip.test
@@ -5,6 +5,7 @@ arguments --no-status-db -Fvj -D ../mamedb-disk.db -e extradir
 file extradir/1234.chd 108-5.chd {}
 file roms/disk/108-5.chd {} 108-5.chd
 file roms/.ckmame.db {} <empty.ckmamedb>
+directory extradir <> <>
 stdout
 In game disk:
 rom  08.rom        size       8  crc 3656897d: missing

diff --git a/regress/doublezip.vtest b/regress/doublezip.vtest
@@ -7,6 +7,7 @@ file unknown/1-4.zip {} 1-4-ok-doublezip.zip
 file unknown/.ckmame.db {} <inline.ckmamedb>
 hashes 1-4.zip 1-4-ok.zip cheap
 end-of-inline-data
+directory roms {} <>
 stdout
 In game 1-4:
 game 1-4                                     : not a single file found

diff --git a/regress/extra-size-mismatch.vtest b/regress/extra-size-mismatch.vtest
@@ -5,6 +5,7 @@ file extra/1-4.zip 1-4-ok.zip
 file extra/.ckmame.db {} <inline.ckmamedb>
 hashes 1-4.zip 04.rom cheap
 end-of-inline-data
+directory roms {} <>
 stdout
 In game 1-8-is-4:
 game 1-8-is-4                                : not a single file found

diff --git a/regress/fixdat-missing-all.vtest b/regress/fixdat-missing-all.vtest
@@ -3,6 +3,7 @@ features HAVE_LIBXML2
 return 0
 arguments --no-status-db -Fvc -D ../mamedb-merge-parent.db --create-fixdat
 file "fixdat_ckmame test db (1).dat" {} fixdat-missing-all.fixdat
+directory roms {} <>
 stdout
 In game grandparent:
 game grandparent                             : not a single file found

diff --git a/regress/fixdat-xml-quoting.vtest b/regress/fixdat-xml-quoting.vtest
@@ -3,6 +3,7 @@ features HAVE_LIBXML2
 return 0
 arguments --no-status-db -Fvc -D ../mamedb-xml-quoting.db --create-fixdat
 file "fixdat_ckmame test db <&> (1).dat" {} fixdat-xml-quoting.fixdat
+directory roms {} <>
 stdout
 In game 2&4c<>;:
 game 2&4c<>;                                 : not a single file found

diff --git a/regress/garbage-archive-exists.vtest b/regress/garbage-archive-exists.vtest
@@ -7,6 +7,7 @@ file unknown/1-4.zip 1-8-ok.zip garbage-1-8-ok.zip
 file unknown/.ckmame.db {} <inline.ckmamedb>
 hashes 1-4.zip * cheap
 end-of-inline-data
+directory roms <> <>
 stdout
 In game 1-4:
 game 1-4                                     : not a single file found

diff --git a/regress/hasherr-extra.vtest b/regress/hasherr-extra.vtest
@@ -4,6 +4,7 @@ arguments -Fvc -e extra deadbeef
 file mame.db mame.db
 file extra/.ckmame.db {} <empty.ckmamedb>
 file extra/deadbeef.zip deadfish.zip
+directory roms {} <>
 stdout
 In game deadbeef:
 game deadbeef                                : not a single file found

diff --git a/regress/hasherr.vtest b/regress/hasherr.vtest
@@ -5,6 +5,7 @@ file mame.db mame.db
 file roms/deadbeef.zip deadpork.zip {}
 file unknown/deadbeef.zip {} deadpork.zip
 file unknown/.ckmame.db {} <empty.ckmamedb>
+directory roms <> <>
 stdout
 In game deadbeef:
 game deadbeef                                : not a single file found

diff --git a/regress/hasherr2.vtest b/regress/hasherr2.vtest
@@ -5,6 +5,7 @@ file mame.db mame.db
 file roms/deadbeef.zip deadfish.zip {}
 file unknown/deadbeef.zip {} deadfish.zip
 file unknown/.ckmame.db {} <empty.ckmamedb>
+directory roms <> <>
 stdout
 In game deadbeef:
 game deadbeef                                : not a single file found

diff --git a/regress/ignore-macos-extra.vtest b/regress/ignore-macos-extra.vtest
@@ -3,6 +3,7 @@ return 0
 arguments --no-status-db -D ../mamedb-lost-parent-ok.db -vFj -e extra
 file extra/._clone-8.zip CMakeLists.txt
 file extra/.DS_Store CMakeLists.txt
+directory roms {} <>
 stdout
 In game clone-8:
 game clone-8                                 : not a single file found

diff --git a/regress/incomplete-basic-b.vtest b/regress/incomplete-basic-b.vtest
@@ -5,6 +5,7 @@ file mame.db mame.db
 file roms/2-48.zip 1-4-ok.zip {}
 file saved/d87f7e0c-000.zip {} 1-4-ok.zip
 file saved/.ckmame.db {} <empty.ckmamedb>
+directory roms <> <>
 stdout
 In game 2-48:
 save needed file '04.rom'

diff --git a/regress/incomplete-basic.vtest b/regress/incomplete-basic.vtest
@@ -5,6 +5,7 @@ file mame.db mame.db
 file roms/2-48.zip 1-4-ok.zip {}
 file saved/d87f7e0c-000.zip {} 1-4-ok.zip
 file saved/.ckmame.db {} <empty.ckmamedb>
+directory roms <> <>
 stdout
 In game 2-48:
 game 2-48                                    : incomplete

diff --git a/regress/incomplete-existing-b.vtest b/regress/incomplete-existing-b.vtest
@@ -5,6 +5,7 @@ file mame.db mame.db
 file roms/2-48.zip 1-4-ok.zip {}
 file saved/d87f7e0c-000.zip 1-4-ok.zip
 file saved/.ckmame.db {} <empty.ckmamedb>
+directory roms <> <>
 stdout
 In game 2-48:
 delete unneeded file '04.rom'

diff --git a/regress/incomplete-existing.vtest b/regress/incomplete-existing.vtest
@@ -5,6 +5,7 @@ file mame.db mame.db
 file roms/2-48.zip 1-4-ok.zip {}
 file saved/d87f7e0c-000.zip 1-4-ok.zip
 file saved/.ckmame.db {} <empty.ckmamedb>
+directory roms <> <>
 stdout
 In game 2-48:
 game 2-48                                    : incomplete

diff --git a/regress/incomplete-from-extra-b.vtest b/regress/incomplete-from-extra-b.vtest
@@ -4,3 +4,4 @@ arguments -FvCje extra --no-report-fixable --no-report-missing 2-48
 file mame.db mame.db
 file extra/.ckmame.db {} <empty.ckmamedb>
 file extra/2-48.zip 1-4-ok.zip
+directory roms {} <>
diff --git a/regress/incomplete-from-extra.vtest b/regress/incomplete-from-extra.vtest
@@ -4,6 +4,7 @@ arguments -FvcCj --report-detailed -e extra 2-48
 file mame.db mame.db
 file extra/.ckmame.db {} <empty.ckmamedb>
 file extra/2-48.zip 1-4-ok.zip
+directory roms {} <>
 stdout
 In game 2-48:
 rom  04.rom        size       4  crc d87f7e0c: not checked

diff --git a/regress/incomplete-merge-b.vtest b/regress/incomplete-merge-b.vtest
@@ -6,6 +6,7 @@ file extra/2-48.zip 1-8-ok.zip {}
 file saved/d87f7e0c-000.zip 1-4-ok.zip {}
 file roms/2-48.zip {} 2-48-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
+directory extra <> <>
 stdout
 In game 2-48:
 rom  04.rom        size       4  crc d87f7e0c: is in 'saved/d87f7e0c-000.zip/04.rom'

diff --git a/regress/incomplete-merge.vtest b/regress/incomplete-merge.vtest
@@ -6,6 +6,7 @@ file extra/2-48.zip 1-8-ok.zip {}
 file saved/d87f7e0c-000.zip 1-4-ok.zip {}
 file roms/2-48.zip {} 2-48-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
+directory extra <> <>
 stdout
 In game 2-48:
 rom  04.rom        size       4  crc d87f7e0c: is in 'saved/d87f7e0c-000.zip/04.rom'

diff --git a/regress/incomplete-second.vtest b/regress/incomplete-second.vtest
@@ -5,6 +5,7 @@ file mame.db mame.db
 file roms/2-48.zip 1-8-ok.zip {}
 file saved/3656897d-000.zip {} 1-8-ok.zip
 file saved/.ckmame.db {} <empty.ckmamedb>
+directory roms <> <>
 stdout
 In game 2-48:
 rom  04.rom        size       4  crc d87f7e0c: missing

diff --git a/regress/missing-mia-report.vtest b/regress/missing-mia-report.vtest
@@ -2,6 +2,7 @@ description test single-rom game (no parent), zip is correct, ROM is mia
 return 0
 arguments -Fv --report-missing-mia 1-mia
 file mame.db mamedb-mia.db
+directory roms {} <>
 stdout
 In game 1-mia:
 game 1-mia                                   : not a single file found (all mia)

diff --git a/regress/missing-mia.vtest b/regress/missing-mia.vtest
@@ -4,3 +4,4 @@ arguments -Fv 1-mia
 file mame.db mamedb-mia.db
 stdout
 end-of-inline-data
+directory roms {} <>
diff --git a/regress/needed-error.vtest b/regress/needed-error.vtest
@@ -5,7 +5,7 @@ file mame.db mame.db
 file roms/1-4.zip 1-8-ok.zip 2-48-ok.zip
 file roms/2-48.zip 1-4-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
-mkdir saved
+directory saved <> {}
 read-only saved
 stdout
 In game 1-4:

diff --git a/regress/needed-exists-different.vtest b/regress/needed-exists-different.vtest
@@ -8,6 +8,7 @@ file saved/deadbeef-001.zip {} deadbeef.zip
 file unknown/deadbeef-000.zip {} deadpork.zip
 file saved/.ckmame.db {} <empty.ckmamedb>
 file unknown/.ckmame.db {} <empty.ckmamedb>
+directory roms <> <>
 stdout
 In game 1-4:
 game 1-4                                     : not a single file found

diff --git a/regress/nogood-allmissing-suppress.vtest b/regress/nogood-allmissing-suppress.vtest
@@ -2,3 +2,4 @@ description test single-rom game with bad dump, no output expected
 return 0
 arguments -Fv nogood
 file mame.db mame.db
+directory roms {} <>
diff --git a/regress/nogood-allmissing.vtest b/regress/nogood-allmissing.vtest
@@ -2,6 +2,7 @@ description test single-rom game with bad dump; with --report-detail, so output
 return 0
 arguments --report-detailed nogood
 file mame.db mame.db
+directory roms {} <>
 stdout
 In game nogood:
 rom  04.rom        size       4  no good dump: missing

diff --git a/regress/nonexist.vtest b/regress/nonexist.vtest
@@ -2,6 +2,7 @@ description testing non-existing game
 return 0
 arguments -Fvc nosuchgame
 file mame.db mame.db
+directory roms {} <>
 stderr
 game 'nosuchgame' unknown
 end-of-inline-data
diff --git a/regress/norom.vtest b/regress/norom.vtest
@@ -2,6 +2,7 @@ description test no-rom game
 return 0
 arguments -Fvc norom
 file mame.db mame.db
+directory roms {} <>
 stdout
 In game norom:
 game norom                                   : correct

diff --git a/regress/old-complete.vtest b/regress/old-complete.vtest
@@ -3,6 +3,7 @@ return 0
 arguments -O ../mamedb-lost-parent-ok.db -Fvc 2-48
 file mame.db mame.db
 file roms/2-48.zip 2-48-ok.zip {}
+directory roms <> <>
 stdout
 In game 2-48:
 rom  04.rom        size       4  crc d87f7e0c: duplicate (also in old 'clone-8')
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,4 @@ baddump @@
     nogood
     norom
     end-of-inline-data
+    directory roms {} <>