aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2024-07-05 23:27:06 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2024-07-05 23:27:06 +0300
commitde5cbeac0f4ef6a71f75af54e926d5b87d4597ea (patch)
tree4cb1aebac326b7210186ea0f79c782fbf7436340
parent0deca1f56bf5c1cdb90d0e38950ed8000ebf491e (diff)
Adapt tests to libbutl's manifest serializer which now uses new-fashioned multi-line value introducerfix-test-manifests
-rw-r--r--tests/ci/ci-load.testscript24
-rw-r--r--tests/submit/submit-dir.testscript3
-rw-r--r--tests/submit/submit-pub.testscript6
3 files changed, 22 insertions, 11 deletions
diff --git a/tests/ci/ci-load.testscript b/tests/ci/ci-load.testscript
index eb9ba7c..ff75493 100644
--- a/tests/ci/ci-load.testscript
+++ b/tests/ci/ci-load.testscript
@@ -105,11 +105,13 @@
email: user@example.org
%depends: \\* build2 .+%
%depends: \\* bpkg .+%
- bootstrap-build:\\
+ bootstrap-build:
+ \\
project = libhello
%.+
\\
- root-build:\\
+ root-build:
+ \\
cxx.std = latest
%.+
\\
@@ -124,11 +126,13 @@
email: user@example.org
%depends: \\* build2 .+%
%depends: \\* bpkg .+%
- bootstrap-build:\\
+ bootstrap-build:
+ \\
project = hello
%.+
\\
- root-build:\\
+ root-build:
+ \\
cxx.std = latest
%.+
\\
@@ -164,11 +168,13 @@
email: user@example.org
%depends: \\* build2 .+%
%depends: \\* bpkg .+%
- bootstrap-build:\\
+ bootstrap-build:
+ \\
project = hello
%.+
\\
- root-build:\\
+ root-build:
+ \\
cxx.std = latest
%.+
\\
@@ -205,11 +211,13 @@
email: user@example.org
%depends: \\* build2 .+%
%depends: \\* bpkg .+%
- bootstrap-build:\\
+ bootstrap-build:
+ \\
project = libhello
%.+
\\
- root-build:\\
+ root-build:
+ \\
cxx.std = latest
%.+
\\
diff --git a/tests/submit/submit-dir.testscript b/tests/submit/submit-dir.testscript
index 285710f..3bc908f 100644
--- a/tests/submit/submit-dir.testscript
+++ b/tests/submit/submit-dir.testscript
@@ -77,7 +77,8 @@
$* >>"EOO"
: 1
status: 400
- message:\\
+ message:
+ \\
package archive is not valid
gzip: libhello-0.1.0.tar.gz: not in gzip format
diff --git a/tests/submit/submit-pub.testscript b/tests/submit/submit-pub.testscript
index 8c042a7..a846b82 100644
--- a/tests/submit/submit-pub.testscript
+++ b/tests/submit/submit-pub.testscript
@@ -182,7 +182,8 @@ clone_root_rep = [cmdline] cp --no-cleanup -r $root_rep ./ &pkg-1/*** &?pkg.lock
$* $~/brep-loader $~/pkg $~/$data_dir >>~"%EOO%"
: 1
status: 400
- message:\\
+ message:
+ \\
submitted archive is not a valid package
%.+
\\
@@ -203,7 +204,8 @@ clone_root_rep = [cmdline] cp --no-cleanup -r $root_rep ./ &pkg-1/*** &?pkg.lock
$* $~/brep-loader $~/pkg $~/$data_dir >>~"%EOO%"
: 1
status: 400
- message:\\
+ message:
+ \\
unable to add package to repository
%.+
\\