From 07ab59a93f9447d5489743e8d7e19b6adb5ebbf1 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 9 Jul 2021 20:55:15 +0300 Subject: Add support for configuration type and bdep-config-link sub-command --- tests/publish.testscript | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) (limited to 'tests/publish.testscript') diff --git a/tests/publish.testscript b/tests/publish.testscript index 8f5ec85..07c3632 100644 --- a/tests/publish.testscript +++ b/tests/publish.testscript @@ -33,7 +33,7 @@ g = git -C prj >! 2>! # duplicate submissions. We will use unique version for each test, # incrementing the patch version for 1.0.X. # -# Next version to use: 1.0.20 +# Next version to use: 1.0.22 # # Normally we disable the progress indication that complicates stderr output @@ -104,7 +104,11 @@ g = git -C prj >! 2>! $init -C @cfg1 &prj-cfg1/***; $init -C @cfg2 &prj-cfg2/***; - $* --all 2>'error: multiple configurations specified for publish' != 0 + $* --all 2>>EOE != 0 + error: package prj is initialized in multiple specified configurations + info: @cfg1 + info: @cfg2 + EOE } : snapshot @@ -152,6 +156,42 @@ g = git -C prj >! 2>! EOE } + : diff-configs + : + { + $clone_prj; + sed -i -e 's/^(version:) .*$/\1 1.0.20/' prj/libprj/manifest; + sed -i -e 's/^(version:) .*$/\1 1.0.20/' prj/prj/manifest; + + $init -C @cfg1 -d prj/libprj &prj-cfg1/***; + $init -C @cfg2 --config-type host -d prj/prj &prj-cfg2/***; + + $* 2>>~%EOE% + %package submission is queued(: \.*libprj/1.0.20)?%d + %reference: .{12}% + %package submission is queued(: \.*prj/1.0.20)?%d + %reference: .{12}% + EOE + } + + : diff-configs-forward + : + { + $clone_prj; + sed -i -e 's/^(version:) .*$/\1 1.0.21/' prj/libprj/manifest; + sed -i -e 's/^(version:) .*$/\1 1.0.21/' prj/prj/manifest; + + $init -C @cfg1 --no-default --forward -d prj/libprj &prj-cfg1/***; + $init -C @cfg2 --config-type host --no-default --forward -d prj/prj &prj-cfg2/***; + + $* --forward 2>>~%EOE% + %package submission is queued(: \.*libprj/1.0.21)?%d + %reference: .{12}% + %package submission is queued(: \.*prj/1.0.21)?%d + %reference: .{12}% + EOE + } + : single : { -- cgit v1.1