diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cfg-create.testscript | 6 | ||||
| -rw-r--r-- | tests/cfg-link.testscript | 12 | ||||
| -rw-r--r-- | tests/pkg-build.testscript | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tests/cfg-create.testscript b/tests/cfg-create.testscript index 46355e5..25225ba 100644 --- a/tests/cfg-create.testscript +++ b/tests/cfg-create.testscript @@ -212,7 +212,7 @@ EOE { uuid='18f48b4b-b5d9-4712-b98c-1930df1c4228'; - $* --config-uuid $uuid --name foo 2>>/~"%EOE%" &cfg/***; + $* --uuid $uuid --name foo 2>>/~"%EOE%" &cfg/***; %created new configuration in .+/cfg/% uuid: $uuid type: target @@ -233,8 +233,8 @@ EOE : : Also use the short option. : - $* --config-uuid '123' 2>>EOE != 0 - error: invalid value '123' for option '--config-uuid' + $* --uuid '123' 2>>EOE != 0 + error: invalid value '123' for option '--uuid' EOE } diff --git a/tests/cfg-link.testscript b/tests/cfg-link.testscript index 4eb0e59..5d903f2 100644 --- a/tests/cfg-link.testscript +++ b/tests/cfg-link.testscript @@ -18,7 +18,7 @@ acfg_uuid = '28f48b4b-b5d9-4712-b98c-1930df1c4228' : { $cfg_create -d cfg --name 'main'; - $cfg_create -d acfg --name 'shared' --config-uuid "$acfg_uuid" &acfg/***; + $cfg_create -d acfg --name 'shared' --uuid "$acfg_uuid" &acfg/***; # Try to link configuration under the same name. # @@ -50,7 +50,7 @@ acfg_uuid = '28f48b4b-b5d9-4712-b98c-1930df1c4228' # Test that the recreated configuration can be implicitly re-linked. # rm -r cfg; - $cfg_create -d cfg --name 'test' --config-uuid "$cfg_uuid" &cfg/***; + $cfg_create -d cfg --name 'test' --uuid "$cfg_uuid" &cfg/***; $* acfg 2>>/~"%EOE%"; %warning: current configuration .+/cfg/ is already implicitly linked with .+/acfg/% @@ -105,7 +105,7 @@ acfg_uuid = '28f48b4b-b5d9-4712-b98c-1930df1c4228' # Link the second configuration. # rm -r acfg; - $cfg_create -d acfg --name 'shared' --config-uuid "$acfg_uuid" &acfg/***; + $cfg_create -d acfg --name 'shared' --uuid "$acfg_uuid" &acfg/***; $pkg_status -d cfg libfoo >'libfoo unknown'; $pkg_status -d acfg2 libfoo >'libfoo unknown'; @@ -113,7 +113,7 @@ acfg_uuid = '28f48b4b-b5d9-4712-b98c-1930df1c4228' # Test that the configuration type mismatch is reported. # mv cfg cfg.tmp; - $cfg_create -d cfg --type host --config-uuid "$cfg_uuid"; + $cfg_create -d cfg --type host --uuid "$cfg_uuid"; $* -d acfg2 cfg 2>>/EOE != 0; error: configuration cfg/ type mismatch @@ -152,7 +152,7 @@ acfg_uuid = '28f48b4b-b5d9-4712-b98c-1930df1c4228' # Test that the repeated implicit link is reported. # - $cfg_create -d cfg2 --config-uuid "$cfg_uuid"; + $cfg_create -d cfg2 --uuid "$cfg_uuid"; $* -d cfg2 acfg2 2>>/~"%EOE%" != 0; %error: current configuration $cfg_uuid is already linked with .+/acfg2/% @@ -183,7 +183,7 @@ acfg_uuid = '28f48b4b-b5d9-4712-b98c-1930df1c4228' EOE rm -r cfg; - $cfg_create -d cfg --name 'test' --config-uuid "$cfg_uuid" &cfg/***; + $cfg_create -d cfg --name 'test' --uuid "$cfg_uuid" &cfg/***; $pkg_status -d cfg2 libfoo >'libfoo unknown'; $pkg_status -d acfg2 libfoo >'libfoo unknown' diff --git a/tests/pkg-build.testscript b/tests/pkg-build.testscript index 7938e60..94d1cf2 100644 --- a/tests/pkg-build.testscript +++ b/tests/pkg-build.testscript @@ -4312,7 +4312,7 @@ else $clone_cfg; $cfg_create -d cfg-bar &cfg-bar/***; - $cfg_create -d cfg-foo --config-uuid $uuid &cfg-foo/***; + $cfg_create -d cfg-foo --uuid $uuid &cfg-foo/***; $cfg_link -d cfg cfg-bar; $cfg_link -d cfg-bar cfg-foo; |