From d4c243bde6d3043b6e04adf249f13e8275ddd528 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 19 Jul 2021 19:26:34 +0300 Subject: Add support for cfg-info --- tests/cfg-create.testscript | 76 ++++++++++++++++++++++++++++++++++++++++----- tests/common.testscript | 1 + 2 files changed, 70 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/cfg-create.testscript b/tests/cfg-create.testscript index b96a98f..e518eea 100644 --- a/tests/cfg-create.testscript +++ b/tests/cfg-create.testscript @@ -7,9 +7,7 @@ config_cxx = config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true) cfg_create += 2>! -# @@ To verify the creation result use cfg-list command rather than -# pkg-status, when implemented. -# +cfg_info += -d cfg pkg_status += -d cfg : non-empty @@ -34,6 +32,13 @@ EOE info: type: target EOE + $cfg_info >>/~"%EOO%"; + %path: .+/cfg/% + %uuid: .{36}% + type: target + %name: % + EOO + $pkg_status libfoo >'libfoo unknown' } @@ -46,6 +51,13 @@ EOE info: type: target EOE + $cfg_info >>/~"%EOO%"; + %path: .+/cfg/% + %uuid: .{36}% + type: target + %name: % + EOO + $pkg_status libfoo >'libfoo unknown'; cat cfg/build/config.build >>/~"%EOO%" @@ -64,6 +76,13 @@ EOE info: type: target EOE + $cfg_info >>/~"%EOO%"; + %path: .+/cfg/% + %uuid: .{36}% + type: target + %name: % + EOO + $pkg_status libfoo >'libfoo unknown'; cat cfg/build/config.build >>/~"%EOO%" @@ -84,6 +103,13 @@ EOE info: type: target EOE + $cfg_info >>/~"%EOO%"; + %path: .+/cfg/% + %uuid: .{36}% + type: target + %name: % + EOO + $pkg_status libfoo >'libfoo unknown' } @@ -98,6 +124,13 @@ EOE info: type: target EOE + $cfg_info >>/~"%EOO%"; + %path: .+/cfg/% + %uuid: .{36}% + type: target + %name: % + EOO + $pkg_status libfoo >'libfoo unknown' } } @@ -117,8 +150,13 @@ EOE info: name: foo EOE - # @@ To verify the result use cfg-list, when implemented. - # + $cfg_info >>/~"%EOO%"; + %path: .+/cfg/% + %uuid: .{36}% + type: target + name: foo + EOO + $pkg_status libfoo >'libfoo unknown' } @@ -145,6 +183,13 @@ EOE info: type: host EOE + $cfg_info >>/~"%EOO%"; + %path: .+/cfg/% + %uuid: .{36}% + type: host + %name: % + EOO + $pkg_status libfoo >'libfoo unknown' } @@ -165,12 +210,22 @@ EOE : valid : { - $* --config-uuid '18f48b4b-b5d9-4712-b98c-1930df1c4228' 2>>/~%EOE% &cfg/***; + uuid='18f48b4b-b5d9-4712-b98c-1930df1c4228'; + + $* --config-uuid $uuid --name foo 2>>/~"%EOE%" &cfg/***; %created new configuration in .+/cfg/% - info: uuid: 18f48b4b-b5d9-4712-b98c-1930df1c4228 + info: uuid: $uuid info: type: target + info: name: foo EOE + $cfg_info >>/~"%EOO%"; + %path: .+/cfg/% + uuid: $uuid + type: target + name: foo + EOO + $pkg_status libfoo >'libfoo unknown' } @@ -200,6 +255,13 @@ EOE info: type: target EOE + $cfg_info >>/~"%EOO%"; + %path: .+/cfg/% + %uuid: .{36}% + type: target + %name: % + EOO + $pkg_status libfoo >'libfoo unknown' } diff --git a/tests/common.testscript b/tests/common.testscript index 105bf3e..8af2cc7 100644 --- a/tests/common.testscript +++ b/tests/common.testscript @@ -33,6 +33,7 @@ test.options += --default-options $options_guard \ # as expected). # cfg_create = $* cfg-create +cfg_info = $* cfg-info cfg_link = $* cfg-link pkg_build = $* pkg-build pkg_checkout = $* pkg-checkout -- cgit v1.1