From 3a6c4ab1b6fc79a6a543088553cdd6bc8cb0a1dd Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 21 May 2018 21:10:09 +0300 Subject: Adapt to inventing package_name type --- tests/common/satisfy/libBar-2.0.0.tar.gz | Bin 0 -> 352 bytes tests/common/satisfy/t6/libBar-2.0.0.tar.gz | 1 + tests/common/satisfy/t6/repositories.manifest | 1 + tests/pkg-build.test | 42 ++++++++++++++++++++++++++ tests/pkg-build/t6 | 1 + tests/pkg-drop.test | 4 +-- 6 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 tests/common/satisfy/libBar-2.0.0.tar.gz create mode 120000 tests/common/satisfy/t6/libBar-2.0.0.tar.gz create mode 120000 tests/common/satisfy/t6/repositories.manifest create mode 120000 tests/pkg-build/t6 (limited to 'tests') diff --git a/tests/common/satisfy/libBar-2.0.0.tar.gz b/tests/common/satisfy/libBar-2.0.0.tar.gz new file mode 100644 index 0000000..9a11ec9 Binary files /dev/null and b/tests/common/satisfy/libBar-2.0.0.tar.gz differ diff --git a/tests/common/satisfy/t6/libBar-2.0.0.tar.gz b/tests/common/satisfy/t6/libBar-2.0.0.tar.gz new file mode 120000 index 0000000..8a99698 --- /dev/null +++ b/tests/common/satisfy/t6/libBar-2.0.0.tar.gz @@ -0,0 +1 @@ +../libBar-2.0.0.tar.gz \ No newline at end of file diff --git a/tests/common/satisfy/t6/repositories.manifest b/tests/common/satisfy/t6/repositories.manifest new file mode 120000 index 0000000..0d4767a --- /dev/null +++ b/tests/common/satisfy/t6/repositories.manifest @@ -0,0 +1 @@ +../repositories.manifest \ No newline at end of file diff --git a/tests/pkg-build.test b/tests/pkg-build.test index 88d069a..7a6a83d 100644 --- a/tests/pkg-build.test +++ b/tests/pkg-build.test @@ -96,6 +96,10 @@ # | |-- libbar-1.2.0.tar.gz # | `-- repositories.manifest # | +# |-- t6 +# | |-- libBar-2.0.0.tar.gz +# | `-- repositories.manifest +# | # |-- libhello-1.0.0 # | |-- build # | | |-- bootstrap.build @@ -125,6 +129,7 @@ cp -r $src/t4c $out/t4c && $rep_create $out/t4c &$out/t4c/packages.manifest cp -r $src/t4d $out/t4d && $rep_create $out/t4d &$out/t4d/packages.manifest cp -r $src/t5 $out/t5 && $rep_create $out/t5 &$out/t5/packages.manifest + cp -r $src/t6 $out/t6 && $rep_create $out/t6 &$out/t6/packages.manifest # Create git repositories. # @@ -3329,6 +3334,43 @@ rep_fetch += -d cfg --auth all --trust-yes 2>! } } +: ignore-case +: +{ + test.arguments += --yes --auth all --trust-yes + + $clone_cfg; + + $* "libbar@$rep/t5" 2>>~%EOE%; + added pkg:build2.org/pkg-build/t5 + fetching pkg:build2.org/pkg-build/t5 + %.* + %.*fetched libbar/1.2.0% + unpacked libbar/1.2.0 + configured libbar/1.2.0 + %info: .+dir\{libbar-1.2.0.\} is up to date% + updated libbar/1.2.0 + EOE + + $* "libbar@$rep/t6" 2>>~%EOE%; + added pkg:build2.org/pkg-build/t6 + fetching pkg:build2.org/pkg-build/t6 + disfigured libbar/1.2.0 + %.* + %.*fetched libBar/2.0.0% + unpacked libBar/2.0.0 + configured libBar/2.0.0 + %info: .+dir\{libBar-2.0.0.\} is up to date% + updated libBar/2.0.0 + EOE + + $pkg_status libbar >'!libBar configured !2.0.0'; + + test -d cfg/libBar-2.0.0; + + $pkg_drop libbar +} + : git-rep : if ($git_supported != true) diff --git a/tests/pkg-build/t6 b/tests/pkg-build/t6 new file mode 120000 index 0000000..1174dda --- /dev/null +++ b/tests/pkg-build/t6 @@ -0,0 +1 @@ +../common/satisfy/t6 \ No newline at end of file diff --git a/tests/pkg-drop.test b/tests/pkg-drop.test index c035837..f0ff50f 100644 --- a/tests/pkg-drop.test +++ b/tests/pkg-drop.test @@ -53,11 +53,11 @@ $* libfoo 2>>/EOE != 0 error: package libfoo does not exist in configuration cfg/ EOE -: unknown-package-ver +: invalid-name : $clone_cfg; $* libfoo/1.0.0 2>>~%EOE% != 0 - %error: package libfoo/1.0.0 does not exist in configuration cfg[/\\]% + %error: invalid package name 'libfoo/1.0.0': illegal character% EOE : dependencies-or-dependents -- cgit v1.1