From fafc5727732c7df2c98b123292f483411e0050e3 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 31 Jan 2022 12:24:28 +0300 Subject: Add support for bootstrap-build and root-build values in package manifest --- tests/common/foo-1.tar.gz | Bin 261 -> 332 bytes .../prereq-cycle/extra/libbar-1.1.0+1.tar.gz | Bin 243 -> 321 bytes tests/common/prereq-cycle/math/libbar-1.0.0.tar.gz | Bin 241 -> 319 bytes .../common/prereq-cycle/stable/libfoo-1.0.0.tar.gz | Bin 240 -> 320 bytes tests/pkg-status/extra/libbar-1.1.0+1.tar.gz | Bin 243 -> 322 bytes tests/pkg-status/stable/libbar-1.0.0.tar.gz | Bin 241 -> 323 bytes tests/pkg-status/stable/libfoo-1.0.0.tar.gz | Bin 240 -> 323 bytes tests/pkg-status/testing/libbar-1.0.0+1.tar.gz | Bin 243 -> 325 bytes tests/pkg-status/testing/libbar-1.1.0.tar.gz | Bin 242 -> 322 bytes tests/pkg-status/unstable/libbar-2.0.0.tar.gz | Bin 245 -> 322 bytes tests/pkg-system/libbar-0+1.tar.gz | Bin 239 -> 319 bytes tests/pkg-verify.testscript | 29 +++++++++++++++ tests/pkg-verify/foo-2.tar.gz | Bin 437 -> 509 bytes tests/pkg-verify/foo-3.tar.gz | Bin 0 -> 412 bytes tests/rep-create.testscript | 36 +++++++++++++++---- tests/rep-create/stable/bar-1.tar.gz | Bin 269 -> 345 bytes tests/rep-create/testing/foo-2.tar.gz | Bin 277 -> 356 bytes .../rep-fetch/no-cycle/extra/libbar-1.1.0+1.tar.gz | Bin 243 -> 323 bytes tests/rep-fetch/no-cycle/math/libbar-1.0.0.tar.gz | Bin 241 -> 324 bytes .../rep-fetch/no-cycle/stable/libfoo-1.0.0.tar.gz | Bin 240 -> 320 bytes tests/rep-info.testscript | 39 +++++++++++++++++++-- tests/rep-list/extra/libbar-1.1.0+1.tar.gz | Bin 243 -> 323 bytes tests/rep-list/math/libbar-1.0.0.tar.gz | Bin 241 -> 324 bytes tests/rep-list/stable/libfoo-1.0.0.tar.gz | Bin 240 -> 321 bytes tests/rep-list/testing/libbar-2.0.0.tar.gz | Bin 245 -> 323 bytes tests/rep-remove/alpha/libbar-2.0.0.tar.gz | Bin 245 -> 323 bytes tests/rep-remove/testing/libbar-2.0.0.tar.gz | Bin 245 -> 28 bytes 27 files changed, 96 insertions(+), 8 deletions(-) create mode 100644 tests/pkg-verify/foo-3.tar.gz mode change 100644 => 120000 tests/rep-remove/testing/libbar-2.0.0.tar.gz (limited to 'tests') diff --git a/tests/common/foo-1.tar.gz b/tests/common/foo-1.tar.gz index 0195f04..0ae2384 100644 Binary files a/tests/common/foo-1.tar.gz and b/tests/common/foo-1.tar.gz differ diff --git a/tests/common/prereq-cycle/extra/libbar-1.1.0+1.tar.gz b/tests/common/prereq-cycle/extra/libbar-1.1.0+1.tar.gz index 890e9e2..9115154 100644 Binary files a/tests/common/prereq-cycle/extra/libbar-1.1.0+1.tar.gz and b/tests/common/prereq-cycle/extra/libbar-1.1.0+1.tar.gz differ diff --git a/tests/common/prereq-cycle/math/libbar-1.0.0.tar.gz b/tests/common/prereq-cycle/math/libbar-1.0.0.tar.gz index 97e6e32..259aeb0 100644 Binary files a/tests/common/prereq-cycle/math/libbar-1.0.0.tar.gz and b/tests/common/prereq-cycle/math/libbar-1.0.0.tar.gz differ diff --git a/tests/common/prereq-cycle/stable/libfoo-1.0.0.tar.gz b/tests/common/prereq-cycle/stable/libfoo-1.0.0.tar.gz index 5e7fa17..30dbd01 100644 Binary files a/tests/common/prereq-cycle/stable/libfoo-1.0.0.tar.gz and b/tests/common/prereq-cycle/stable/libfoo-1.0.0.tar.gz differ diff --git a/tests/pkg-status/extra/libbar-1.1.0+1.tar.gz b/tests/pkg-status/extra/libbar-1.1.0+1.tar.gz index 890e9e2..08f2867 100644 Binary files a/tests/pkg-status/extra/libbar-1.1.0+1.tar.gz and b/tests/pkg-status/extra/libbar-1.1.0+1.tar.gz differ diff --git a/tests/pkg-status/stable/libbar-1.0.0.tar.gz b/tests/pkg-status/stable/libbar-1.0.0.tar.gz index 97e6e32..e49f301 100644 Binary files a/tests/pkg-status/stable/libbar-1.0.0.tar.gz and b/tests/pkg-status/stable/libbar-1.0.0.tar.gz differ diff --git a/tests/pkg-status/stable/libfoo-1.0.0.tar.gz b/tests/pkg-status/stable/libfoo-1.0.0.tar.gz index 5e7fa17..da5cc08 100644 Binary files a/tests/pkg-status/stable/libfoo-1.0.0.tar.gz and b/tests/pkg-status/stable/libfoo-1.0.0.tar.gz differ diff --git a/tests/pkg-status/testing/libbar-1.0.0+1.tar.gz b/tests/pkg-status/testing/libbar-1.0.0+1.tar.gz index 5794085..9c2d0ed 100644 Binary files a/tests/pkg-status/testing/libbar-1.0.0+1.tar.gz and b/tests/pkg-status/testing/libbar-1.0.0+1.tar.gz differ diff --git a/tests/pkg-status/testing/libbar-1.1.0.tar.gz b/tests/pkg-status/testing/libbar-1.1.0.tar.gz index b01ac44..6ca773a 100644 Binary files a/tests/pkg-status/testing/libbar-1.1.0.tar.gz and b/tests/pkg-status/testing/libbar-1.1.0.tar.gz differ diff --git a/tests/pkg-status/unstable/libbar-2.0.0.tar.gz b/tests/pkg-status/unstable/libbar-2.0.0.tar.gz index 6cc5890..98616f8 100644 Binary files a/tests/pkg-status/unstable/libbar-2.0.0.tar.gz and b/tests/pkg-status/unstable/libbar-2.0.0.tar.gz differ diff --git a/tests/pkg-system/libbar-0+1.tar.gz b/tests/pkg-system/libbar-0+1.tar.gz index 9f90936..7461443 100644 Binary files a/tests/pkg-system/libbar-0+1.tar.gz and b/tests/pkg-system/libbar-0+1.tar.gz differ diff --git a/tests/pkg-verify.testscript b/tests/pkg-verify.testscript index 9c56466..69c29b0 100644 --- a/tests/pkg-verify.testscript +++ b/tests/pkg-verify.testscript @@ -91,6 +91,10 @@ $* --deep --ignore-unknown --manifest $src/foo-2.tar.gz >>EOO url: http://www.example.org/foo email: foo-users@example.org depends: bar == 2 + bootstrap-build:\ + project = foo + + \ EOO : incomplete-dependency @@ -107,3 +111,28 @@ $* --ignore-unknown --manifest $src/foo-2.tar.gz >>EOO email: foo-users@example.org depends: bar == $ EOO + +: no-bootstrap-build +: +{ + : no-deep + : + $* --manifest $src/foo-3.tar.gz >>EOO + : 1 + name: foo + version: 3 + summary: The "Foo" utility + license: MIT + description-file: README + changes-file: NEWS + url: http://www.example.org/foo + email: foo-users@example.org + depends: bar == $ + EOO + + : deep + : + $* --deep --manifest $src/foo-3.tar.gz 2>>/~%EOE% != 0 + %error: unable to find bootstrap.build file in package archive .+/foo-3.tar.gz% + EOE +} diff --git a/tests/pkg-verify/foo-2.tar.gz b/tests/pkg-verify/foo-2.tar.gz index 5f5739d..f2d3db8 100644 Binary files a/tests/pkg-verify/foo-2.tar.gz and b/tests/pkg-verify/foo-2.tar.gz differ diff --git a/tests/pkg-verify/foo-3.tar.gz b/tests/pkg-verify/foo-3.tar.gz new file mode 100644 index 0000000..67edccd Binary files /dev/null and b/tests/pkg-verify/foo-3.tar.gz differ diff --git a/tests/rep-create.testscript b/tests/rep-create.testscript index 4f40f7a..63b7064 100644 --- a/tests/rep-create.testscript +++ b/tests/rep-create.testscript @@ -41,8 +41,12 @@ url: http://www.example.org/bar email: bar-users@example.org depends: foo == 1 + bootstrap-build:\ + project = bar + + \ location: bar-1.tar.gz - sha256sum: 514a99f5fadb94f946f8abff59caa9c3cc442cd4f30d4383a1cf6d26ca058036 + sha256sum: 56528e387d1b8e18e3ee7e8510916afdb65f881acfd49d959fae6f434c3bab3c : name: foo version: 1 @@ -50,8 +54,12 @@ license: MIT url: http://www.example.org/foo email: foo-users@example.org + bootstrap-build:\ + project = foo + + \ location: foo-1.tar.gz - sha256sum: fee330a362a4f87ff42a954aa305b6446d541b7b60000ebcd2fbf68f2b1ae58e + sha256sum: 1d88df336611286cdbd84f5c1d87bedc774bc833e200de675e34d9b219c66cfc EOO } @@ -78,8 +86,12 @@ url: http://www.example.org/bar email: bar-users@example.org depends: foo == 1 + bootstrap-build:\ + project = bar + + \ location: bar-1.tar.gz - sha256sum: 514a99f5fadb94f946f8abff59caa9c3cc442cd4f30d4383a1cf6d26ca058036 + sha256sum: 56528e387d1b8e18e3ee7e8510916afdb65f881acfd49d959fae6f434c3bab3c : name: foo version: 1 @@ -87,8 +99,12 @@ license: MIT url: http://www.example.org/foo email: foo-users@example.org + bootstrap-build:\ + project = foo + + \ location: foo-1.tar.gz - sha256sum: fee330a362a4f87ff42a954aa305b6446d541b7b60000ebcd2fbf68f2b1ae58e + sha256sum: 1d88df336611286cdbd84f5c1d87bedc774bc833e200de675e34d9b219c66cfc EOO } } @@ -132,8 +148,12 @@ url: http://www.example.org/bar email: bar-users@example.org depends: foo == 1 + bootstrap-build:\\ + project = bar + + \\ location: bar-1.tar.gz - sha256sum: 514a99f5fadb94f946f8abff59caa9c3cc442cd4f30d4383a1cf6d26ca058036 + sha256sum: 56528e387d1b8e18e3ee7e8510916afdb65f881acfd49d959fae6f434c3bab3c : name: foo version: 1 @@ -141,8 +161,12 @@ license: MIT url: http://www.example.org/foo email: foo-users@example.org + bootstrap-build:\\ + project = foo + + \\ location: foo-1.tar.gz - sha256sum: fee330a362a4f87ff42a954aa305b6446d541b7b60000ebcd2fbf68f2b1ae58e + sha256sum: 1d88df336611286cdbd84f5c1d87bedc774bc833e200de675e34d9b219c66cfc EOO } diff --git a/tests/rep-create/stable/bar-1.tar.gz b/tests/rep-create/stable/bar-1.tar.gz index 66c79a2..d4e6103 100644 Binary files a/tests/rep-create/stable/bar-1.tar.gz and b/tests/rep-create/stable/bar-1.tar.gz differ diff --git a/tests/rep-create/testing/foo-2.tar.gz b/tests/rep-create/testing/foo-2.tar.gz index cb39194..77a7678 100644 Binary files a/tests/rep-create/testing/foo-2.tar.gz and b/tests/rep-create/testing/foo-2.tar.gz differ diff --git a/tests/rep-fetch/no-cycle/extra/libbar-1.1.0+1.tar.gz b/tests/rep-fetch/no-cycle/extra/libbar-1.1.0+1.tar.gz index 890e9e2..8c5c1ee 100644 Binary files a/tests/rep-fetch/no-cycle/extra/libbar-1.1.0+1.tar.gz and b/tests/rep-fetch/no-cycle/extra/libbar-1.1.0+1.tar.gz differ diff --git a/tests/rep-fetch/no-cycle/math/libbar-1.0.0.tar.gz b/tests/rep-fetch/no-cycle/math/libbar-1.0.0.tar.gz index 97e6e32..0697d84 100644 Binary files a/tests/rep-fetch/no-cycle/math/libbar-1.0.0.tar.gz and b/tests/rep-fetch/no-cycle/math/libbar-1.0.0.tar.gz differ diff --git a/tests/rep-fetch/no-cycle/stable/libfoo-1.0.0.tar.gz b/tests/rep-fetch/no-cycle/stable/libfoo-1.0.0.tar.gz index 5e7fa17..7cb8934 100644 Binary files a/tests/rep-fetch/no-cycle/stable/libfoo-1.0.0.tar.gz and b/tests/rep-fetch/no-cycle/stable/libfoo-1.0.0.tar.gz differ diff --git a/tests/rep-info.testscript b/tests/rep-info.testscript index 7161188..992f0e9 100644 --- a/tests/rep-info.testscript +++ b/tests/rep-info.testscript @@ -109,8 +109,12 @@ $* --name $rep/testing >"pkg:build2.org/rep-info/testing ($rep/testing)" license: MIT url: http://www.example.org/foo email: foo-users@example.org + bootstrap-build:\ + project = foo + + \ location: foo-1.tar.gz - sha256sum: fee330a362a4f87ff42a954aa305b6446d541b7b60000ebcd2fbf68f2b1ae58e + sha256sum: 1d88df336611286cdbd84f5c1d87bedc774bc833e200de675e34d9b219c66cfc EOO : deep @@ -135,6 +139,15 @@ $* --name $rep/testing >"pkg:build2.org/rep-info/testing ($rep/testing)" \ description-type: text/plain %.+ + bootstrap-build:\ + project = libbar + + using config + using version + using dist + + \ + %.+ EOO rm state0/libbar.git/libbar/README; @@ -164,6 +177,15 @@ $* --name $rep/testing >"pkg:build2.org/rep-info/testing ($rep/testing)" \ description-type: text/plain %.+ + bootstrap-build:\ + project = libbar + + using config + using version + using dist + + \ + %.+ : name: libmbar version: 1.0.0 @@ -175,6 +197,15 @@ $* --name $rep/testing >"pkg:build2.org/rep-info/testing ($rep/testing)" \ description-type: text/plain %.+ + bootstrap-build:\ + project = libmbar + + using config + using version + using dist + + \ + %.+ EOO } } @@ -203,8 +234,12 @@ $* --name $rep/testing >"pkg:build2.org/rep-info/testing ($rep/testing)" license: MIT url: http://www.example.org/foo email: foo-users@example.org + bootstrap-build:\ + project = foo + + \ location: foo-1.tar.gz - sha256sum: fee330a362a4f87ff42a954aa305b6446d541b7b60000ebcd2fbf68f2b1ae58e + sha256sum: 1d88df336611286cdbd84f5c1d87bedc774bc833e200de675e34d9b219c66cfc EOO } } diff --git a/tests/rep-list/extra/libbar-1.1.0+1.tar.gz b/tests/rep-list/extra/libbar-1.1.0+1.tar.gz index 890e9e2..b761fa7 100644 Binary files a/tests/rep-list/extra/libbar-1.1.0+1.tar.gz and b/tests/rep-list/extra/libbar-1.1.0+1.tar.gz differ diff --git a/tests/rep-list/math/libbar-1.0.0.tar.gz b/tests/rep-list/math/libbar-1.0.0.tar.gz index 97e6e32..425315a 100644 Binary files a/tests/rep-list/math/libbar-1.0.0.tar.gz and b/tests/rep-list/math/libbar-1.0.0.tar.gz differ diff --git a/tests/rep-list/stable/libfoo-1.0.0.tar.gz b/tests/rep-list/stable/libfoo-1.0.0.tar.gz index 5e7fa17..1b030ab 100644 Binary files a/tests/rep-list/stable/libfoo-1.0.0.tar.gz and b/tests/rep-list/stable/libfoo-1.0.0.tar.gz differ diff --git a/tests/rep-list/testing/libbar-2.0.0.tar.gz b/tests/rep-list/testing/libbar-2.0.0.tar.gz index 6cc5890..55cd8bd 100644 Binary files a/tests/rep-list/testing/libbar-2.0.0.tar.gz and b/tests/rep-list/testing/libbar-2.0.0.tar.gz differ diff --git a/tests/rep-remove/alpha/libbar-2.0.0.tar.gz b/tests/rep-remove/alpha/libbar-2.0.0.tar.gz index 6cc5890..576b562 100644 Binary files a/tests/rep-remove/alpha/libbar-2.0.0.tar.gz and b/tests/rep-remove/alpha/libbar-2.0.0.tar.gz differ diff --git a/tests/rep-remove/testing/libbar-2.0.0.tar.gz b/tests/rep-remove/testing/libbar-2.0.0.tar.gz deleted file mode 100644 index 6cc5890..0000000 Binary files a/tests/rep-remove/testing/libbar-2.0.0.tar.gz and /dev/null differ diff --git a/tests/rep-remove/testing/libbar-2.0.0.tar.gz b/tests/rep-remove/testing/libbar-2.0.0.tar.gz new file mode 120000 index 0000000..f2d26fe --- /dev/null +++ b/tests/rep-remove/testing/libbar-2.0.0.tar.gz @@ -0,0 +1 @@ +../alpha/libbar-2.0.0.tar.gz \ No newline at end of file -- cgit v1.1