Adapt more directives to new syntax.

nih-at · Nov 24, 2023 · 6326141 · 6326141
1 parent 4ba2dcc
commit 6326141
Show file tree

Hide file tree

Showing 80 changed files with 110 additions and 132 deletions.
diff --git a/regress/config-extra-directories-append.test b/regress/config-extra-directories-append.test
@@ -8,7 +8,7 @@ file roms/2-48.zip {} 2-48-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
 file extra/.ckmame.db {} <empty.ckmamedb>
 file search/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 extra-directories = [ "extra" ]
 ["Test"]

diff --git a/regress/config-extra-directories.test b/regress/config-extra-directories.test
@@ -6,7 +6,7 @@ file search/14.zip 1-4-ok.zip
 file roms/1-4.zip {} 1-4-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
 file search/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 extra-directories = [ "search" ]
 end-of-inline-data

diff --git a/regress/config-home-set.test b/regress/config-home-set.test
@@ -1,11 +1,11 @@
 description test config in home directory is used, set overrides
 return 0
-setenv HOME ./home
+environment-set HOME ./home
 arguments --set "Test" -F 1-4 1-8
 file mame.db mame.db
 file roms-set/1-4.zip 1-4-ok.zip
 file roms-set/.ckmame.db {} <empty.ckmamedb>
-file-data home/.config/ckmame/ckmamerc
+file home/.config/ckmame/ckmamerc <inline>
 [global]
 rom-directory = "roms-home"
 ["Test"]

diff --git a/regress/config-home.test b/regress/config-home.test
@@ -1,11 +1,11 @@
 description test config in home directory is used
 return 0
-setenv HOME ./home
+environment-set HOME ./home
 arguments -F 1-4 1-8
 file mame.db mame.db
 file roms-home/1-4.zip 1-4-ok.zip
 file roms-home/.ckmame.db {} <empty.ckmamedb>
-file-data home/.config/ckmame/ckmamerc
+file home/.config/ckmame/ckmamerc <inline>
 [global]
 rom-directory = "roms-home"
 end-of-inline-data

diff --git a/regress/config-invalid-array.test b/regress/config-invalid-array.test
@@ -1,6 +1,6 @@
 description check config parser for invalid booleans
 return 1
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 dat-directories = "something"
 end-of-inline-data

diff --git a/regress/config-invalid-boolean.test b/regress/config-invalid-boolean.test
@@ -1,6 +1,6 @@
 description check config parser for invalid booleans
 return 1
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 report-missing = "something"
 end-of-inline-data

diff --git a/regress/config-invalid-string.test b/regress/config-invalid-string.test
@@ -1,6 +1,6 @@
 description check config parser for invalid booleans
 return 1
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 rom-directory = [ "an", "array" ]
 end-of-inline-data

diff --git a/regress/config-keep-old-duplicate.test b/regress/config-keep-old-duplicate.test
@@ -4,7 +4,7 @@ arguments -F 2-4a
 file mame.db mame.db
 file roms/2-4a.zip 2-4a-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 old-db = "../makedb-lost-parent-ok.db"
 keep-old-duplicate = true

diff --git a/regress/config-local-overrides-home.test b/regress/config-local-overrides-home.test
@@ -1,11 +1,11 @@
 description test config in local directory overrides the one in HOME directory
 return 0
-setenv HOME ./home
+environment-set HOME ./home
 arguments -F 1-4 1-8
 file mame.db mame.db
 file roms-local/1-4.zip 1-4-ok.zip
 file roms-local/.ckmame.db {} <empty.ckmamedb>
-file-data home/.config/ckmame/ckmamerc
+file home/.config/ckmame/ckmamerc <inline>
 [global]
 rom-directory = "roms-home"
 end-of-inline-data

diff --git a/regress/config-local-set-overrides-home-set.test b/regress/config-local-set-overrides-home-set.test
@@ -1,11 +1,11 @@
 description test config in local directory overrides the one in HOME directory (with set)
 return 0
-setenv HOME ./home
+environment-set HOME ./home
 arguments --set "Test" -F 1-4 1-8
 file mame.db mame.db
 file roms-set/1-4.zip 1-4-ok.zip
 file roms-set/.ckmame.db {} <empty.ckmamedb>
-file-data home/.config/ckmame/ckmamerc
+file home/.config/ckmame/ckmamerc <inline>
 [global]
 rom-directory = "roms-home"
 ["Test"]

diff --git a/regress/config-local-set.test b/regress/config-local-set.test
@@ -1,11 +1,11 @@
 description test config in local directory is used, set overrides
 return 0
-setenv HOME ./home
+environment-set HOME ./home
 arguments --set "Test" -F 1-4 1-8
 file mame.db mame.db
 file roms-set/1-4.zip 1-4-ok.zip
 file roms-set/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 rom-directory = "roms-local"
 ["Test"]

diff --git a/regress/config-move-from-extra-2.test b/regress/config-move-from-extra-2.test
@@ -1,6 +1,6 @@
 description test single-rom game (no parent), move-from-extra specific to extra-directory
 return 0
-setenv HOME ./home
+environment-set HOME ./home
 arguments -F 2-48
 file mame.db mame.db
 file search/1-4.zip 1-4-ok.zip
@@ -9,7 +9,7 @@ file roms/2-48.zip {} 2-48-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
 file extra/.ckmame.db {} <empty.ckmamedb>
 file search/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 [global.extra-directories]
 "search" = { "move-from-extra" = false }

diff --git a/regress/config-move-from-extra.test b/regress/config-move-from-extra.test
@@ -6,7 +6,7 @@ file search/14.zip 1-4-ok.zip {}
 file roms/1-4.zip {} 1-4-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
 file search/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 move-from-extra = true
 end-of-inline-data

diff --git a/regress/config-no-complete-games-only.test b/regress/config-no-complete-games-only.test
@@ -4,7 +4,7 @@ arguments -F 2-48
 file mame.db mame.db
 file roms/2-48.zip 1-4-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 complete-games-only = false
 end-of-inline-data

diff --git a/regress/config-no-create-fixdat.test b/regress/config-no-create-fixdat.test
@@ -1,7 +1,7 @@
 description test all games, no files found, do not create fixdat based on config setting
 return 0
 arguments -F -D ../mamedb-merge-parent.db
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 create-fixdat = false
 end-of-inline-data

diff --git a/regress/config-no-report-correct.test b/regress/config-no-report-correct.test
@@ -4,7 +4,7 @@ arguments -F 1-4 1-8
 file mame.db mame.db
 file roms/1-4.zip 1-4-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 report-correct = false
 verbose = true

diff --git a/regress/config-no-report-detailed.test b/regress/config-no-report-detailed.test
@@ -4,7 +4,7 @@ arguments -F 1-4 1-8
 file mame.db mame.db
 file roms/1-4.zip 1-4-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 report-detailed = false
 verbose = true

diff --git a/regress/config-no-report-fixable.test b/regress/config-no-report-fixable.test
@@ -6,7 +6,7 @@ file roms/1-4.zip 1-4-ok.zip
 file extra/1-8.zip 1-8-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
 file extra/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 report-fixable = false
 verbose = true

diff --git a/regress/config-no-report-missing.test b/regress/config-no-report-missing.test
@@ -4,7 +4,7 @@ arguments 2-48 1-8
 file mame.db mame.db
 file roms/2-48.zip 1-4-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 report-missing = false
 verbose = true

diff --git a/regress/config-old-db.test b/regress/config-old-db.test
@@ -4,7 +4,7 @@ arguments -F 2-4a
 file mame.db mame.db
 file roms/2-4a.zip 2-4a-ok.zip 1-a-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 old-db = "../mamedb-lost-parent-ok.db"
 end-of-inline-data

diff --git a/regress/config-profile-unknown.test b/regress/config-profile-unknown.test
@@ -1,9 +1,9 @@
 description report error for unknown profile in config file
 return 1
-setenv HOME ./home
+environment-set HOME ./home
 arguments --set Test 1-4
 file mame.db mame.db
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 verbose = false
 [profile.verbose]

diff --git a/regress/config-profile.test b/regress/config-profile.test
@@ -1,11 +1,11 @@
 description test profiles and their selection work
 return 0
-setenv HOME ./home
+environment-set HOME ./home
 arguments --set Test -F 1-4 1-8
 file mame.db mame.db
 file roms-local/1-4.zip 1-4-ok.zip
 file roms-local/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 report-correct = true
 report-missing = true

diff --git a/regress/config-report-correct.test b/regress/config-report-correct.test
@@ -4,7 +4,7 @@ arguments -F 1-4 1-8
 file mame.db mame.db
 file roms/1-4.zip 1-4-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 report-correct = true
 verbose = true

diff --git a/regress/config-report-detailed.test b/regress/config-report-detailed.test
@@ -4,7 +4,7 @@ arguments -F 1-4 1-8
 file mame.db mame.db
 file roms/1-4.zip 1-4-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 report-detailed = true
 verbose = true

diff --git a/regress/config-report-fixable.test b/regress/config-report-fixable.test
@@ -6,7 +6,7 @@ file roms/1-4.zip 1-4-ok.zip
 file extra/1-8.zip 1-8-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
 file extra/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 report-fixable = true
 verbose = true

diff --git a/regress/config-report-missing.test b/regress/config-report-missing.test
@@ -4,7 +4,7 @@ arguments 2-48 1-8
 file mame.db mame.db
 file roms/2-48.zip 1-4-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 report-missing = true
 verbose = true

diff --git a/regress/config-report-no-good-dump.test b/regress/config-report-no-good-dump.test
@@ -4,7 +4,7 @@ arguments nogood-2
 file mame.db mame.db
 file roms/nogood-2.zip 1-8-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 report-no-good-dump = true
 end-of-inline-data

diff --git a/regress/config-rom-db.test b/regress/config-rom-db.test
@@ -1,7 +1,7 @@
 description test all games, no files found, use rom-db from config
 return 0
 arguments -F
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 rom-db = "../mamedb-merge-parent.db"
 end-of-inline-data

diff --git a/regress/config-rom-directory.test b/regress/config-rom-directory.test
@@ -4,7 +4,7 @@ arguments 1-4
 file mame.db mame.db
 file roms-local/1-4.zip 1-4-ok.zip
 file roms-local/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 rom-directory = "roms-local"
 end-of-inline-data
diff --git a/regress/config-roms-zipped.test b/regress/config-roms-zipped.test
@@ -3,7 +3,7 @@ description test all games, no files found, unzipped per config
 return 0
 arguments -v 1-4
 file mame.db mame.db
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 roms-zipped = false
 end-of-inline-data

diff --git a/regress/config-saved-directory.test b/regress/config-saved-directory.test
@@ -6,7 +6,7 @@ file roms/1-4.zip 2-48-ok.zip 1-4-ok.zip
 file extra-later/3656897d-000.zip {} 1-8-ok.zip
 file roms/.ckmame.db {} <empty.ckmamedb>
 file extra-later/.ckmame.db {} <empty.ckmamedb>
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 saved-directory = "extra-later"
 end-of-inline-data

diff --git a/regress/config-sets-file.test b/regress/config-sets-file.test
@@ -2,7 +2,7 @@ description read sets list from file
 #variants zip
 return 0
 arguments --list-sets
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 sets = [ "standard set 1", "standard set 2" ]
 sets-file = "sets-list"

diff --git a/regress/config-unknown-variable.test b/regress/config-unknown-variable.test
@@ -1,7 +1,7 @@
 description config parameter unknown
 return 1
 arguments -F
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 unknown = "defined"
 end-of-inline-data

diff --git a/regress/config-use-central-cache-directory.test b/regress/config-use-central-cache-directory.test
@@ -1,7 +1,7 @@
 description test single-rom game (no parent), file is in search dir from config, keep, use central cache
 #variants zip
 return 0
-setenv HOME ./home
+environment-set HOME ./home
 arguments -F 1-4
 file mame.db mame.db
 file search/1-4.zip 1-4-ok.zip

diff --git a/regress/disk-from-extra-using-copy-remove.test b/regress/disk-from-extra-using-copy-remove.test
@@ -2,7 +2,7 @@ description test single-rom game with disk, get missing disk from extra, rename
 #variants zip
 return 0
 preload fwrite.so
-setenv RENAME_FAILS roms/108-5.chd
+environment-set RENAME_FAILS roms/108-5.chd
 arguments -Fvj -D ../mamedb-disk.db -e extradir
 file extradir/1234.chd 108-5.chd {}
 file roms/disk/108-5.chd {} 108-5.chd

diff --git a/regress/disk-nogood-copy.test b/regress/disk-nogood-copy.test
@@ -7,12 +7,10 @@ file extras/108-nogood.chd 12-1.chd
 file roms/.ckmame.db {} <empty.ckmamedb>
 file extras/.ckmame.db {} <empty.ckmamedb>
 no-hashes roms disk-nogood.zip 04.rom
+# file name alone shouldn't be enough
 stdout
 In game disk-nogood:
 rom  04.rom        size       4  crc d87f7e0c: correct
-end-of-inline-data
-# file name alone shouldn't be enough
-stdout
 disk 108-nogood    no good dump              : missing
 In game disk-nogood2:
 rom  08.rom        size       8  crc 3656897d: missing

diff --git a/regress/diskfull-zip.test b/regress/diskfull-zip.test
@@ -1,12 +1,12 @@
 description test copying file from extra, failing (disk full) and cleaning up extra
 #variants zip
 return 0
-setenv FWRITE_MAX_WRITE 5
+environment-set FWRITE_MAX_WRITE 5
 preload fwrite.so
 arguments -Fjvc -D ../mamedb-lost-parent-ok.db -e extra
 ckmamedb-after extra ckmamedb-wrongname-nohash.dump
 file extra/wrongname.zip 2-48-ok.zip
-touch 1422359238 extra/wrongname.zip
+set-modification-time extra/wrongname.zip 1422359238
 stdout
 In game clone-8:
 rom  04.rom        size       4  crc d87f7e0c: is in 'extra/wrongname.zip/04.rom'

diff --git a/regress/dumpgame-list-sets.test b/regress/dumpgame-list-sets.test
@@ -3,7 +3,7 @@ return 0
 arguments --list-sets
 file mame.db mame.db
 program dumpgame
-file-data .ckmamerc
+file .ckmamerc <inline>
 [global]
 sets = [ "standard set 1", "standard set 2" ]
 ["non-standard set 1"]