diff options
Diffstat (limited to 'tests')
36 files changed, 56 insertions, 2 deletions
diff --git a/tests/common/dependency-alternatives/t8a/box-1.0.0.tar.gz b/tests/common/dependency-alternatives/t8a/box-1.0.0.tar.gz Binary files differindex babc96c..f266c46 100644 --- a/tests/common/dependency-alternatives/t8a/box-1.0.0.tar.gz +++ b/tests/common/dependency-alternatives/t8a/box-1.0.0.tar.gz diff --git a/tests/common/git/state0/libbar.tar b/tests/common/git/state0/libbar.tar Binary files differindex a06e98f..4312752 100644 --- a/tests/common/git/state0/libbar.tar +++ b/tests/common/git/state0/libbar.tar diff --git a/tests/common/git/state0/libfoo.tar b/tests/common/git/state0/libfoo.tar Binary files differindex b73307c..af2affc 100644 --- a/tests/common/git/state0/libfoo.tar +++ b/tests/common/git/state0/libfoo.tar diff --git a/tests/common/git/state0/libfox.tar b/tests/common/git/state0/libfox.tar Binary files differindex 641598d..d955085 100644 --- a/tests/common/git/state0/libfox.tar +++ b/tests/common/git/state0/libfox.tar diff --git a/tests/common/git/state0/links.tar b/tests/common/git/state0/links.tar Binary files differindex 360765e..3376bf7 100644 --- a/tests/common/git/state0/links.tar +++ b/tests/common/git/state0/links.tar diff --git a/tests/common/git/state0/style-basic.tar b/tests/common/git/state0/style-basic.tar Binary files differindex 344df4b..5f60782 100644 --- a/tests/common/git/state0/style-basic.tar +++ b/tests/common/git/state0/style-basic.tar diff --git a/tests/common/git/state0/style.tar b/tests/common/git/state0/style.tar Binary files differindex 293cea1..d95f00b 100644 --- a/tests/common/git/state0/style.tar +++ b/tests/common/git/state0/style.tar diff --git a/tests/common/git/state1/libbaz.tar b/tests/common/git/state1/libbaz.tar Binary files differindex 151bdb9..f10cc12 100644 --- a/tests/common/git/state1/libbaz.tar +++ b/tests/common/git/state1/libbaz.tar diff --git a/tests/common/git/state1/libfoo.tar b/tests/common/git/state1/libfoo.tar Binary files differindex 7e61ac6..4ce25d1 100644 --- a/tests/common/git/state1/libfoo.tar +++ b/tests/common/git/state1/libfoo.tar diff --git a/tests/common/git/state1/libfox.tar b/tests/common/git/state1/libfox.tar Binary files differindex 54485df..7de6ffa 100644 --- a/tests/common/git/state1/libfox.tar +++ b/tests/common/git/state1/libfox.tar diff --git a/tests/common/git/state1/style-basic.tar b/tests/common/git/state1/style-basic.tar Binary files differindex dd5ef5a..1693a33 100644 --- a/tests/common/git/state1/style-basic.tar +++ b/tests/common/git/state1/style-basic.tar diff --git a/tests/common/git/state1/style.tar b/tests/common/git/state1/style.tar Binary files differindex 14ee6c9..3fbf69e 100644 --- a/tests/common/git/state1/style.tar +++ b/tests/common/git/state1/style.tar diff --git a/tests/common/linked/t7a/foo-1.0.0.tar.gz b/tests/common/linked/t7a/foo-1.0.0.tar.gz Binary files differindex 1720e36..8a7161e 100644 --- a/tests/common/linked/t7a/foo-1.0.0.tar.gz +++ b/tests/common/linked/t7a/foo-1.0.0.tar.gz diff --git a/tests/common/linked/t7a/libbar-1.0.0.tar.gz b/tests/common/linked/t7a/libbar-1.0.0.tar.gz Binary files differindex 21940a3..1deed07 100644 --- a/tests/common/linked/t7a/libbar-1.0.0.tar.gz +++ b/tests/common/linked/t7a/libbar-1.0.0.tar.gz diff --git a/tests/common/linked/t7a/libbaz-1.0.0.tar.gz b/tests/common/linked/t7a/libbaz-1.0.0.tar.gz Binary files differindex 82d89fa..3cdd0b4 100644 --- a/tests/common/linked/t7a/libbaz-1.0.0.tar.gz +++ b/tests/common/linked/t7a/libbaz-1.0.0.tar.gz diff --git a/tests/common/linked/t7a/libbiz-1.0.0.tar.gz b/tests/common/linked/t7a/libbiz-1.0.0.tar.gz Binary files differindex 1214925..7495f26 100644 --- a/tests/common/linked/t7a/libbiz-1.0.0.tar.gz +++ b/tests/common/linked/t7a/libbiz-1.0.0.tar.gz diff --git a/tests/common/linked/t7a/libbox-1.0.0.tar.gz b/tests/common/linked/t7a/libbox-1.0.0.tar.gz Binary files differindex 7c293e0..071d544 100644 --- a/tests/common/linked/t7a/libbox-1.0.0.tar.gz +++ b/tests/common/linked/t7a/libbox-1.0.0.tar.gz diff --git a/tests/common/linked/t7a/libbuild2-bar-1.0.0.tar.gz b/tests/common/linked/t7a/libbuild2-bar-1.0.0.tar.gz Binary files differindex 789b4e8..5f0b592 100644 --- a/tests/common/linked/t7a/libbuild2-bar-1.0.0.tar.gz +++ b/tests/common/linked/t7a/libbuild2-bar-1.0.0.tar.gz diff --git a/tests/common/linked/t7a/libbuild2-foo-1.0.0.tar.gz b/tests/common/linked/t7a/libbuild2-foo-1.0.0.tar.gz Binary files differindex 2a9ce1b..5d900ab 100644 --- a/tests/common/linked/t7a/libbuild2-foo-1.0.0.tar.gz +++ b/tests/common/linked/t7a/libbuild2-foo-1.0.0.tar.gz diff --git a/tests/common/linked/t7a/libbuz-1.0.0.tar.gz b/tests/common/linked/t7a/libbuz-1.0.0.tar.gz Binary files differindex 4d0ea38..a75fff9 100644 --- a/tests/common/linked/t7a/libbuz-1.0.0.tar.gz +++ b/tests/common/linked/t7a/libbuz-1.0.0.tar.gz diff --git a/tests/common/linked/t7a/libfax-1.0.0.tar.gz b/tests/common/linked/t7a/libfax-1.0.0.tar.gz Binary files differindex a460e4a..ffb7257 100644 --- a/tests/common/linked/t7a/libfax-1.0.0.tar.gz +++ b/tests/common/linked/t7a/libfax-1.0.0.tar.gz diff --git a/tests/common/linked/t7a/libfix-1.0.0.tar.gz b/tests/common/linked/t7a/libfix-1.0.0.tar.gz Binary files differindex fbfadde..e6649e7 100644 --- a/tests/common/linked/t7a/libfix-1.0.0.tar.gz +++ b/tests/common/linked/t7a/libfix-1.0.0.tar.gz diff --git a/tests/common/linked/t7b/foo-1.1.0.tar.gz b/tests/common/linked/t7b/foo-1.1.0.tar.gz Binary files differindex aa929fb..c30edc8 100644 --- a/tests/common/linked/t7b/foo-1.1.0.tar.gz +++ b/tests/common/linked/t7b/foo-1.1.0.tar.gz diff --git a/tests/common/linked/t7b/libbar-1.1.0.tar.gz b/tests/common/linked/t7b/libbar-1.1.0.tar.gz Binary files differindex 9926348..053792c 100644 --- a/tests/common/linked/t7b/libbar-1.1.0.tar.gz +++ b/tests/common/linked/t7b/libbar-1.1.0.tar.gz diff --git a/tests/common/linked/t7b/libbaz-1.1.0.tar.gz b/tests/common/linked/t7b/libbaz-1.1.0.tar.gz Binary files differindex 6b12460..ec28e55 100644 --- a/tests/common/linked/t7b/libbaz-1.1.0.tar.gz +++ b/tests/common/linked/t7b/libbaz-1.1.0.tar.gz diff --git a/tests/common/linked/t7b/libbox-1.1.0.tar.gz b/tests/common/linked/t7b/libbox-1.1.0.tar.gz Binary files differindex 698661d..e8baa20 100644 --- a/tests/common/linked/t7b/libbox-1.1.0.tar.gz +++ b/tests/common/linked/t7b/libbox-1.1.0.tar.gz diff --git a/tests/common/satisfy/libbar-1.0.0.tar.gz b/tests/common/satisfy/libbar-1.0.0.tar.gz Binary files differindex 5dc3a9b..00220d7 100644 --- a/tests/common/satisfy/libbar-1.0.0.tar.gz +++ b/tests/common/satisfy/libbar-1.0.0.tar.gz diff --git a/tests/common/satisfy/libbar-1.1.0.tar.gz b/tests/common/satisfy/libbar-1.1.0.tar.gz Binary files differindex 16a8b47..7e5c9d0 100644 --- a/tests/common/satisfy/libbar-1.1.0.tar.gz +++ b/tests/common/satisfy/libbar-1.1.0.tar.gz diff --git a/tests/common/satisfy/libbar-1.2.0.tar.gz b/tests/common/satisfy/libbar-1.2.0.tar.gz Binary files differindex 4572395..f8fb1ec 100644 --- a/tests/common/satisfy/libbar-1.2.0.tar.gz +++ b/tests/common/satisfy/libbar-1.2.0.tar.gz diff --git a/tests/common/satisfy/libbaz-1.1.0.tar.gz b/tests/common/satisfy/libbaz-1.1.0.tar.gz Binary files differindex 1aa72a8..d0ef717 100644 --- a/tests/common/satisfy/libbaz-1.1.0.tar.gz +++ b/tests/common/satisfy/libbaz-1.1.0.tar.gz diff --git a/tests/common/satisfy/libbox-1.2.0.tar.gz b/tests/common/satisfy/libbox-1.2.0.tar.gz Binary files differnew file mode 100644 index 0000000..1f8675a --- /dev/null +++ b/tests/common/satisfy/libbox-1.2.0.tar.gz diff --git a/tests/common/satisfy/libfoo-1.0.0.tar.gz b/tests/common/satisfy/libfoo-1.0.0.tar.gz Binary files differindex 41da9a0..be052c2 100644 --- a/tests/common/satisfy/libfoo-1.0.0.tar.gz +++ b/tests/common/satisfy/libfoo-1.0.0.tar.gz diff --git a/tests/common/satisfy/libfoo-1.1.0.tar.gz b/tests/common/satisfy/libfoo-1.1.0.tar.gz Binary files differindex e03481f..2b95877 100644 --- a/tests/common/satisfy/libfoo-1.1.0.tar.gz +++ b/tests/common/satisfy/libfoo-1.1.0.tar.gz diff --git a/tests/common/satisfy/t5/libbox-1.2.0.tar.gz b/tests/common/satisfy/t5/libbox-1.2.0.tar.gz new file mode 120000 index 0000000..3d49749 --- /dev/null +++ b/tests/common/satisfy/t5/libbox-1.2.0.tar.gz @@ -0,0 +1 @@ +../libbox-1.2.0.tar.gz
\ No newline at end of file diff --git a/tests/pkg-build.testscript b/tests/pkg-build.testscript index aaa7bc4..157a3ef 100644 --- a/tests/pkg-build.testscript +++ b/tests/pkg-build.testscript @@ -107,6 +107,7 @@ # | # |-- t5 # | |-- libbar-1.2.0.tar.gz +# | |-- libbox-1.2.0.tar.gz # | `-- repositories.manifest # | # |-- t6 @@ -2079,6 +2080,41 @@ test.arguments += --sys-no-query } } } + + : config-vars + : + { + $cfg_create -d cfg cc config.cc.coptions=-Wall 2>- &cfg/***; + $rep_add $rep/t5 && $rep_fetch; + + $* --configure-only { config.cc.coptions+=-g }+ libbar \ + { config.cc.coptions+=-O }+ libbox 2>>EOE; + fetched libbar/1.2.0 + unpacked libbar/1.2.0 + fetched libbox/1.2.0 + unpacked libbox/1.2.0 + configured libbar/1.2.0 + configured libbox/1.2.0 + EOE + + cat cfg/build/config.build >>~%EOO%; + %.* + config.cc.coptions = -Wall + %.* + EOO + + cat cfg/libbar-1.2.0/build/config.build >>~%EOO%; + %.* + config.cc.coptions = -Wall -g + %.* + EOO + + cat cfg/libbox-1.2.0/build/config.build >>~%EOO% + %.* + config.cc.coptions = -Wall -O + %.* + EOO + } } : dependency @@ -3949,6 +3985,7 @@ test.arguments += --sys-no-query cat cfg/box-1.0.0/build/config.build >>~%EOO%; %.* config.box.backend = libbox + %.* EOO $pkg_drop box; @@ -3994,6 +4031,7 @@ test.arguments += --sys-no-query cat cfg/box-1.0.0/build/config.build >>~%EOO%; %.* config.box.backend = libbiz + %.* EOO $pkg_drop box @@ -4055,6 +4093,7 @@ test.arguments += --sys-no-query cat cfg/box-1.0.0/build/config.build >>~%EOO%; %.* config.box.backend = libbiz + %.* EOO $pkg_drop box; @@ -4095,6 +4134,7 @@ test.arguments += --sys-no-query cat cfg/box-1.0.0/build/config.build >>~%EOO%; %.* config.box.backend = libbox + %.* EOO # Downgrade libbaz to reconfigure box and make sure we still keep @@ -4130,6 +4170,7 @@ test.arguments += --sys-no-query cat cfg/box-1.0.0/build/config.build >>~%EOO%; %.* config.box.backend = libbox + %.* EOO # Make sure the decision is hold for downgraded dependency either. @@ -4158,6 +4199,7 @@ test.arguments += --sys-no-query cat cfg/box-1.0.0/build/config.build >>~%EOO%; %.* config.box.backend = libbox + %.* EOO $pkg_drop box; @@ -14440,6 +14482,7 @@ test.arguments += --sys-no-query +cp -r $src/libhello-1.0.0 ./libhello +cat <<EOI >+libhello/build/root.build config [bool] config.libhello.develop ?= false + config [bool] config.libhello.extras ?= false if ($build.mode != 'skeleton') text "develop=$config.libhello.develop" EOI @@ -14455,9 +14498,9 @@ test.arguments += --sys-no-query $clone_cfg; $* libhello 2>!; # Update after output directory change. - # Use bogus configuration variable to trigger reconfiguration. + # Specify a configuration variable to trigger reconfiguration. # - $* config.libhello.bogus=true -- libhello 2>>~%EOE% + $* config.libhello.extras=true -- libhello 2>>~%EOE% disfigured libhello/1.0.0 %.*: develop=true% configured libhello/1.0.0 diff --git a/tests/pkg-configure.testscript b/tests/pkg-configure.testscript index 2374460..8430cec 100644 --- a/tests/pkg-configure.testscript +++ b/tests/pkg-configure.testscript @@ -276,6 +276,11 @@ if ($posix && "$uid" != '0') : dependency-management : { + # Remove the config.cxx variable override to avoid the 'dropping no longer + # used variable' warning. + # + test.arguments = $regex.filter_out_match($test.arguments, 'config.cxx=.*') + +$clone_cfg && $rep_add $rep/stable && $rep_fetch --trust-yes : still-has-deps @@ -420,6 +425,11 @@ if ($posix && "$uid" != '0') : dependency-alternatives : { + # Remove the config.cxx variable override to avoid the 'dropping no longer + # used variable' warning. + # + test.arguments = $regex.filter_out_match($test.arguments, 'config.cxx=.*') + +$clone_root_cfg && $rep_add $rep/t8a && $rep_fetch --trust-yes : multiple-dependencies |