16 files changed, 297 insertions, 48 deletions
diff --git a/tests/ci/data.testscript b/tests/ci/data.testscript
index e269d0d..6f44c85 100644
--- a/tests/ci/data.testscript
+++ b/tests/ci/data.testscript
@@ -3,11 +3,11 @@
 
 # Pre-created CI request data directory that will be copied by subsequent
 # tests and scope setup commands. The common approach will be that group
-# scopes copy and modify the parent scope submission directory as required
+# scopes copy and modify the parent scope request data directory as required
 # by the nested tests and scopes. Tests will also clone the parent scope
-# submission data directory to optionally modify it, use and cleanup at the
-# end. Note that configuration can not be shared between multiple submission
-# handler processes. Also we need to make sure that submission data
+# request data data directory to optionally modify it, use and cleanup at the
+# end. Note that request data directory can not be shared between multiple
+# submission handler processes. Also we need to make sure that request data
 # directories are not cloned while being used by submission handler scripts.
 #
 data_dir = $regex.replace($path_search('*/request.manifest', $src_base), \
diff --git a/tests/load/1/math/libfoo-1.2.4+1.tar.gz b/tests/load/1/math/libfoo-1.2.4+1.tar.gz
index 2dde730..db22a19 100644
--- a/tests/load/1/math/libfoo-1.2.4+1.tar.gz
+++ b/tests/load/1/math/libfoo-1.2.4+1.tar.gz
diff --git a/tests/load/1/math/libfoo-tests-1.2.4.tar.gz b/tests/load/1/math/libfoo-tests-1.2.4.tar.gz
index 2efccd0..84a7913 100644
--- a/tests/load/1/math/libfoo-tests-1.2.4.tar.gz
+++ b/tests/load/1/math/libfoo-tests-1.2.4.tar.gz
diff --git a/tests/load/1/math/packages.manifest b/tests/load/1/math/packages.manifest
index 8e66ddf..574370a 100644
--- a/tests/load/1/math/packages.manifest
+++ b/tests/load/1/math/packages.manifest
@@ -71,14 +71,28 @@ Useful for conversion of research code into production environments.
 [^mathlab]: MATLAB Capabilities: TODO
 \
 description-type: text/markdown
+package-description:\
+This project builds and defines the build2 package for the libfoo library.
+
+A modern C++ library with easy to use linear algebra and lot of optimization
+tools.
+
+There are over 100 functions in total with an extensive test suite. The API is
+similar to ~~mathlab~~ **MATLAB**.[^mathlab]
+
+Useful for conversion of research code into production environments.
+[^mathlab]: MATLAB Capabilities: TODO
+\
+package-description-type: text/markdown
 changes:\
-1.2.4+1
+**1.2.4+1**
  * applied patch for critical bug-219
  * regenerated documentation
 
-1.2.4
+**1.2.4**
  * test suite extended significantly
 \
+changes-type: text/markdown
 url: http://www.example.com/foo/; Project home page.
 doc-url: http://www.example.org/projects/libfoo/man.xhtml; Documentation page.
 src-url: http://scm.example.com/?p=odb/libodb.git\;a=tree; Source tree url.
@@ -97,23 +111,24 @@ requires: ? ($windows); Only 64-bit.
 requires: x86_64 ? ; Only if on Windows.
 requires: * vc++ >= 12.0 ? (windows); Only if using VC++ on Windows.
 requires: host
-tests: * libfoo-tests == 1.2.4
+tests: * libfoo-tests == 1.2.4 ? (!$defined(config.libfoo_tests.test))\
+ config.libfoo_tests.test=libfoo
 examples: libfoo-examples
 benchmarks: libfoo-benchmarks > 0.0.1
 builds: all
-network-build-config: config.libfoo.network=true; Enable networking API.
 network-build-include: windows-vc_14d/x86_64-microsoft-win32-msvc14.0
 network-build-exclude: **
+network-build-config: config.libfoo.network=true; Enable networking API.
+cache-builds: default
+cache-builds: -linux
+cache-build-include: windows-vc_14d/x86_64-microsoft-win32-msvc14.0
+cache-build-exclude: **
 cache-build-config:\
 config.libfoo.cache=true
 config.libfoo.buffer=4096
 ;
 Enable caching.
 \
-cache-builds: default
-cache-builds: -linux
-cache-build-include: windows-vc_14d/x86_64-microsoft-win32-msvc14.0
-cache-build-exclude: **
 bootstrap-build:\
 project = libfoo
 
@@ -126,7 +141,7 @@ config [uint64] config.libfoo.buffer ?= 1024
 
 \
 location: libfoo-1.2.4+1.tar.gz
-sha256sum: fe07978d72ab65c2ad72b0325aa56944cf093248d39edcb472a2fe5835defa3d
+sha256sum: ffce9d3e3ca9899d3fd6da1f6b93c07cce2c3f6b7004948b59757dae420f801b
 :
 name: libfoo-benchmarks
 version: 1.2.4
@@ -161,8 +176,12 @@ bootstrap-build:\
 project = libfoo-tests
 
 \
+root-build:\
+config [strings] config.libfoo_tests.test
+
+\
 location: libfoo-tests-1.2.4.tar.gz
-sha256sum: bff1e47ef4f9658072dd7f412e97f80179d4257323568c3fa77ce6adbf89ebd1
+sha256sum: 29a97b3356c42602dd81ee2766c242f8974b0a92d8560cb107dd464655d3d527
 :
 name: libpq
 version: 0
diff --git a/tests/load/1/misc/packages.manifest b/tests/load/1/misc/packages.manifest
index b019920..86620dd 100644
--- a/tests/load/1/misc/packages.manifest
+++ b/tests/load/1/misc/packages.manifest
@@ -15,6 +15,7 @@ depends: libfoo
 depends: libmath >= 2.0.0
 requires: linux | windows | macosx
 changes: some changes
+changes-type: text/plain
 location: libbar-2.4.0+3.tar.gz
 sha256sum: 70ccba3da34dd0296866027a26b6bacf08cacc80f54516d3b8d8eeccbe31ab93
 :
diff --git a/tests/load/1/stable/packages.manifest b/tests/load/1/stable/packages.manifest
index 8d51838..f15ab90 100644
--- a/tests/load/1/stable/packages.manifest
+++ b/tests/load/1/stable/packages.manifest
@@ -75,6 +75,7 @@ description: Very good foo library.
 description-type: text/plain
 changes: some changes 1
 changes: some changes 2
+changes-type: text/plain
 url: http://www.example.com/foo/
 email: foo-users@example.com
 depends: libmisc >= 2.0.0
diff --git a/tests/load/1/stable/signature.manifest b/tests/load/1/stable/signature.manifest
index 9d3b944..bb18e13 100644
--- a/tests/load/1/stable/signature.manifest
+++ b/tests/load/1/stable/signature.manifest
@@ -1,13 +1,13 @@
 : 1
-sha256sum: 300aaa95b27809ca4bccf4b6eeb5f81701117457bd9e6018964004d4bbedbfb8
+sha256sum: defa57373e20beb8f22a391b1e97ec7f5e50469e050c2551e8522fab74f304e1
 signature:\
-kBjhtZKRx9FJmJmm+Bh8gUmvK99kQCWmA9qlyLWLfOiapvtliGn65eCh1uCbrjKWGri8SHPD1ABZ
-aYcfPE5Cg6L40FltFqYF5qliZo2V8Um3JPd56Bm1S8/yBTftojEBNS4RYBLcLLmd6Blmb9/igTAQ
-OOTep/zb3IGZuFzbiLHbfhP7VA4m7PUxV7AlZwSY8IhxzGurQWfBIpGskqkGk57mO+rQy3sq6bWH
-IzbgA4hvfkiXyXzcuDIlfcSQaIAfzClqybNaEFgkqKeoZgUkPLbZiYCGasyVCSmCE0gthgOZL7gJ
-sJU3iyQMeawCKuQhCr2wz1xhJjLdT41eQ1b4YbtKKneVKOhZDRXosw86xk0Ghi7SeNmWVa2y0UIg
-fLIU8um23Gh5Tf37C4pyWjSLVJ4TwAvUGPhxBxd1E2Khuvak/x/+vo983tEikI14InLkdt/KdVpd
-lprE9YEACNFaSJ1cwI6aX8exL4a7kku3YG65Mgg+JD5E1HGAOIfCZ/4FJxBF5Mq6cXDT0fIcVR7b
-ioAJVa9q+EdRrMXlovCCDvmFUvwggTTL1N1/8o0gZrgJW76BTZrNA+MJ2pkwlsJDrNi6JhqbcbOn
-ldZG1n5IwCEt4SvL2LV5iR/iH7iWrIPnkqJJu8rGKWWywz+mmOsl/TBpQylKKXmYLAnWA31htC4=
+f9b/Q+mBos6MwwFPIiIBqSEidqO+rMsktQ1ESWEkO48uHN+hjNCog0gp3Vf4QHj0p2KKU5Uz4exj
+8h7R3RB0F4B10/lDyHw4XlvAyP1uE+YS76rEXHXuGBEnGvBK9818WkCJ5yfFJYg3AuGt2Cyd3QHF
+Uxv+fDkI05KrZNGzLo9euDr6yhHOMTjwSntu/lt6ytfyzTFHcs0xOM03qEtszD5QrNdC32z7kmDE
+8ISUlMUyqOjsz8h25F04NyiojccGTpfUTgqA2zXqMAwRn+fG9wU5Vwnau/oIcAO+nUruR4i1VrDd
+D5q/gjbOpcBTt7bmbVInR5glbgdPZ7r7gpqfOVwybxeTrArj72jA/XmmYyZlaTTW1RXcJuRIWAcP
+2Z61O+cwP9CqW8ktQDNGkgDxxXJR7aEG64G8q7uZeb6v1FaQCwo2JEe/Tv0JDp+DBVKwBm7ZDZi/
+TVtltbADgISCU8bTVz/r4Q0qwHeiQo2GV+Di4h7KvWS8H2Q7sjpyWrI3/UzujOp+zB/BP+6dNZTr
+6Mf8CJ+9L5YY4lzX9jeVQLOuKOqLLZWD2VQiyaYZp79X5OtSHuNvCWcaWUa9Rpu/goLCPrk6QHD+
+wUTYcIdsEbX2jDN3YQwe53WklytPbMxy7taRF1obpGOpDDju3InD3IRXS7ch4G9XzqtsylzMIeE=
 \
diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx
index ae3d03d..0f2c8de 100644
--- a/tests/load/driver.cxx
+++ b/tests/load/driver.cxx
@@ -57,7 +57,7 @@ check_external (const package& p)
          !p.internal ()                   &&
          p.other_repositories.size () > 0 &&
          p.priority == priority ()        &&
-         p.changes.empty ()               &&
+         !p.changes                       &&
          p.license_alternatives.empty ()  &&
          p.dependencies.empty ()          &&
          p.requirements.empty ()          &&
@@ -384,7 +384,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpvxy->other_repositories.empty ());
 
     assert (fpvxy->priority == priority::low);
-    assert (fpvxy->changes.empty ());
+    assert (!fpvxy->changes);
 
     assert (fpvxy->license_alternatives.size () == 1);
     assert (fpvxy->license_alternatives[0].size () == 1);
@@ -420,7 +420,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpv1->other_repositories[1].load () == cr);
 
     assert (fpv1->priority == priority::low);
-    assert (fpv1->changes.empty ());
+    assert (!fpv1->changes);
 
     assert (fpv1->license_alternatives.size () == 1);
     assert (fpv1->license_alternatives[0].size () == 1);
@@ -454,7 +454,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpv2->internal_repository.load () == sr);
     assert (fpv2->other_repositories.empty ());
     assert (fpv2->priority == priority::low);
-    assert (fpv2->changes.empty ());
+    assert (!fpv2->changes);
 
     assert (fpv2->license_alternatives.size () == 1);
     assert (fpv2->license_alternatives[0].size () == 1);
@@ -500,7 +500,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpv2a->internal_repository.load () == sr);
     assert (fpv2a->other_repositories.empty ());
     assert (fpv2a->priority == priority::security);
-    assert (fpv2a->changes.empty ());
+    assert (!fpv2a->changes);
 
     assert (fpv2a->license_alternatives.size () == 1);
     assert (fpv2a->license_alternatives[0].size () == 1);
@@ -563,7 +563,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpv3->other_repositories.empty ());
     assert (fpv3->priority == priority::medium);
 
-    assert (fpv3->changes.empty ());
+    assert (!fpv3->changes);
 
     assert (fpv3->license_alternatives.size () == 1);
     assert (fpv3->license_alternatives[0].size () == 1);
@@ -591,7 +591,7 @@ test_pkg_repos (const cstrings& loader_args,
 
     assert (fpv4->summary == "The Foo Library");
     assert (fpv4->keywords == labels ({"c++", "foo"}));
-    assert (*fpv4->description == "Very good foo library.");
+    assert (fpv4->description->text == "Very good foo library.");
     assert (fpv4->url && fpv4->url->string () == "http://www.example.com/foo/");
     assert (!fpv4->package_url);
     assert (fpv4->email && *fpv4->email == "foo-users@example.com");
@@ -600,7 +600,10 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpv4->internal_repository.load () == sr);
     assert (fpv4->other_repositories.empty ());
     assert (fpv4->priority == priority::low);
-    assert (fpv4->changes == "some changes 1\n\nsome changes 2");
+
+    assert (fpv4->changes &&
+            fpv4->changes->text == "some changes 1\n\nsome changes 2" &&
+            fpv4->changes->type == text_type::plain);
 
     assert (fpv4->license_alternatives.size () == 1);
     assert (fpv4->license_alternatives[0].comment ==
@@ -686,7 +689,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (xpv->internal_repository.load () == mr);
     assert (xpv->other_repositories.empty ());
     assert (xpv->priority == priority::low);
-    assert (xpv->changes.empty ());
+    assert (!xpv->changes);
 
     assert (xpv->license_alternatives.size () == 1);
     assert (xpv->license_alternatives[0].size () == 1);
@@ -724,7 +727,19 @@ test_pkg_repos (const cstrings& loader_args,
             labels ({"math library", "math API", "libbaz fork"}));
     assert (fpv5->keywords == labels ({"c++", "foo", "math", "best"}));
 
-    assert (*fpv5->description ==
+    assert (fpv5->description->text ==
+            "A modern C++ library with easy to use linear algebra and lot "
+            "of optimization\ntools.\n\nThere are over 100 functions in "
+            "total with an extensive test suite. The API is\nsimilar to "
+            "~~mathlab~~ **MATLAB**.[^mathlab]\n\nUseful for conversion of "
+            "research code into production environments.\n"
+            "[^mathlab]: MATLAB Capabilities: TODO");
+
+    assert (fpv5->description->type == text_type::github_mark);
+
+    assert (fpv5->package_description->text ==
+            "This project builds and defines the build2 package for the "
+            "libfoo library.\n\n"
             "A modern C++ library with easy to use linear algebra and lot "
             "of optimization\ntools.\n\nThere are over 100 functions in "
             "total with an extensive test suite. The API is\nsimilar to "
@@ -732,6 +747,8 @@ test_pkg_repos (const cstrings& loader_args,
             "research code into production environments.\n"
             "[^mathlab]: MATLAB Capabilities: TODO");
 
+    assert (fpv5->package_description->type == text_type::github_mark);
+
     assert (fpv5->url && fpv5->url->string () == "http://www.example.com/foo/");
 
     assert (fpv5->doc_url && fpv5->doc_url->string () ==
@@ -756,14 +773,16 @@ test_pkg_repos (const cstrings& loader_args,
     assert (fpv5->priority.comment ==
             "Critical bug fixes, performance improvement.");
 
-    const char ch[] = R"DLM(1.2.4+1
+    const char ch[] = R"DLM(**1.2.4+1**
  * applied patch for critical bug-219
  * regenerated documentation
 
-1.2.4
+**1.2.4**
  * test suite extended significantly)DLM";
 
-    assert (fpv5->changes == ch);
+    assert (fpv5->changes             &&
+            fpv5->changes->text == ch &&
+            fpv5->changes->type == text_type::github_mark);
 
     assert (fpv5->license_alternatives.size () == 2);
     assert (fpv5->license_alternatives[0].comment ==
@@ -843,7 +862,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (check_location (fpv5));
 
     assert (fpv5->sha256sum && *fpv5->sha256sum ==
-            "fe07978d72ab65c2ad72b0325aa56944cf093248d39edcb472a2fe5835defa3d");
+            "ffce9d3e3ca9899d3fd6da1f6b93c07cce2c3f6b7004948b59757dae420f801b");
 
     assert (fpv5->buildable);
 
@@ -859,7 +878,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (epv->project == "mathLab");
     assert (epv->summary == "The exponent");
     assert (epv->keywords == labels ({"mathlab", "c++", "exponent"}));
-    assert (epv->description && *epv->description ==
+    assert (epv->description && epv->description->text ==
             "The exponent math function.");
     assert (epv->url && epv->url->string () == "http://exp.example.com");
     assert (!epv->package_url);
@@ -870,7 +889,7 @@ test_pkg_repos (const cstrings& loader_args,
     assert (epv->internal_repository.load () == mr);
     assert (epv->other_repositories.empty ());
     assert (epv->priority == priority (priority::low));
-    assert (epv->changes.empty ());
+    assert (!epv->changes);
 
     assert (epv->license_alternatives.size () == 1);
     assert (epv->license_alternatives[0].size () == 1);
diff --git a/tests/submit/data.testscript b/tests/submit/data.testscript
index 29b607f..b0fe8f0 100644
--- a/tests/submit/data.testscript
+++ b/tests/submit/data.testscript
@@ -3,12 +3,13 @@
 
 # Pre-created submission data directory that will be copied by subsequent
 # tests and scope setup commands. The common approach will be that group
-# scopes copy and modify the parent scope submission directory as required by
-# the nested tests and scopes. Tests will also clone the parent scope
-# submission data directory to optionally modify it, use and cleanup at the
-# end. Note that configuration can not be shared between multiple submission
-# handler processes. Also we need to make sure that submission data
-# directories are not cloned while being used by submission handler scripts.
+# scopes copy and modify the parent scope submission data directory as
+# required by the nested tests and scopes. Tests will also clone the parent
+# scope submission data directory to optionally modify it, use and cleanup at
+# the end. Note that submission data directory can not be shared between
+# multiple submission handler processes. Also we need to make sure that
+# submission data directories are not cloned while being used by submission
+# handler scripts.
 #
 data_dir = $regex.replace($path_search('*/request.manifest', $src_base), \
                           '(.*)/.*', \
diff --git a/tests/submit/submit-dir.testscript b/tests/submit/submit-dir.testscript
index 81dc494..285710f 100644
--- a/tests/submit/submit-dir.testscript
+++ b/tests/submit/submit-dir.testscript
@@ -77,7 +77,16 @@
     $* >>"EOO"
       : 1
       status: 400
-      message: archive is not a valid package \(run bpkg pkg-verify for details\)
+      message:\\
+      package archive is not valid
+
+      gzip: libhello-0.1.0.tar.gz: not in gzip format
+      tar: This does not look like a tar archive
+      tar: libhello-0.1.0/manifest: Not found in archive
+      tar: Exiting with failure status due to previous errors
+        info: libhello-0.1.0.tar.gz does not appear to be a bpkg package
+        info: run bpkg pkg-verify for details
+      \\
       reference: $checksum
       EOO
   }
diff --git a/tests/submit/submit-git.testscript b/tests/submit/submit-git.testscript
index ec87637..5197afc 100644
--- a/tests/submit/submit-git.testscript
+++ b/tests/submit/submit-git.testscript
@@ -21,7 +21,11 @@ clone_root_ref = [cmdline] cp --no-cleanup -r $root_ref ./ &ref.git/***
 +mkdir --no-cleanup $root_ref
 +$g -C $root_ref init --bare &ref.git/***
 
-+$g clone $root_ref $root_ref_dir &ref/***
+# Convert specific warnings to infos as we expect them to appear. This, in
+# particular, prevents bbot workers to set task result status to warning.
+#
++git clone $root_ref $root_ref_dir &ref/*** 2>&1 | \
+ sed -e 's/warning: (.*cloned an empty repository.*)/info: \1/' >&2 2>!
 
 +cat <<EOI >=$root_ref_dir/submit.config.bash
   sections[alpha]=1/alpha
diff --git a/tests/upload/545f1f78-63ea-4acf-bcb8-37b2513a78c8/archive.tar b/tests/upload/545f1f78-63ea-4acf-bcb8-37b2513a78c8/archive.tar
new file mode 100644
index 0000000..d3b5b17
--- /dev/null
+++ b/tests/upload/545f1f78-63ea-4acf-bcb8-37b2513a78c8/archive.tar
diff --git a/tests/upload/545f1f78-63ea-4acf-bcb8-37b2513a78c8/request.manifest b/tests/upload/545f1f78-63ea-4acf-bcb8-37b2513a78c8/request.manifest
new file mode 100644
index 0000000..c59303b
--- /dev/null
+++ b/tests/upload/545f1f78-63ea-4acf-bcb8-37b2513a78c8/request.manifest
@@ -0,0 +1,22 @@
+: 1
+id: 545f1f78-63ea-4acf-bcb8-37b2513a78c8
+session: 4d4c8b36-56c5-42e0-91d1-58bfd1228002/libhello/1.1.0+10/x86_64-linux-\
+gnu/linux_fedora_37-gcc_12.2-bindist/default/queue/0.3.0/1683122318585120886
+instance: archive
+archive: archive.tar
+sha256sum: 4fa79e4e11a03db321514800806a2b0a3a8eef9375dc22963f4e5a16764c0d5e
+timestamp: 2023-05-08T09:18:20Z
+name: libhello
+version: 1.1.0+10
+project: hello
+target-config: linux_fedora_37-gcc_12.2-bindist
+package-config: default
+target: x86_64-linux-gnu
+tenant: 4d4c8b36-56c5-42e0-91d1-58bfd1228002
+toolchain-name: queue
+toolchain-version: 0.3.0
+repository-name: git:build2.org/var/scm/hello/libhello#master@7f62790591b66bd\
+a248140013bdbd12bf078c2a2
+machine-name: linux_fedora_37-bindist-gcc_12.2
+machine-summary: Fedora Linux 37 with system-default GCC 12.2.1 and bpkg-pkg-\
+bindist prerequisites
diff --git a/tests/upload/buildfile b/tests/upload/buildfile
new file mode 100644
index 0000000..32d7720
--- /dev/null
+++ b/tests/upload/buildfile
@@ -0,0 +1,13 @@
+# file      : tests/upload/buildfile
+# license   : MIT; see accompanying LICENSE file
+
+dir = ../../brep/handler/upload/
+
+include $dir
+
+commons = data
+
+./: testscript{* -{$commons}} common_testscript{$commons} {*/ -test/}{**} \
+    $dir/exe{brep-upload-bindist}
+
+testscript{upload-bindist}@./: test = $out_base/$dir/brep-upload-bindist
diff --git a/tests/upload/data.testscript b/tests/upload/data.testscript
new file mode 100644
index 0000000..3d3eede
--- /dev/null
+++ b/tests/upload/data.testscript
@@ -0,0 +1,34 @@
+# file      : tests/upload/data.testscript
+# license   : MIT; see accompanying LICENSE file
+
+# Pre-created upload data directory that will be copied by subsequent tests
+# and scope setup commands. The common approach will be that group scopes copy
+# and modify the parent scope upload data directory as required by the nested
+# tests and scopes. Tests will also clone the parent scope upload data
+# directory to optionally modify it, use and cleanup at the end. Note that
+# upload data directory can not be shared between multiple upload handler
+# processes. Also we need to make sure that upload data directories are not
+# cloned while being used by upload handler scripts.
+#
+data_dir = $regex.replace($path_search('*/request.manifest', $src_base), \
+                          '(.*)/.*', \
+                          '\1')
+
+request_id = "$data_dir"
+
+# Copy the original upload data directory to the root scope.
+#
++cp -r $src_base/$data_dir ./
+
+root_data_dir = $~/$data_dir
+
+# The most commonly used upload data directory cloning command that copies it
+# from the parent scope working directory.
+#
+clone_data       = [cmdline] cp --no-cleanup -r ../$data_dir ./
+clone_data_clean = [cmdline] cp --no-cleanup -r ../$data_dir ./ &$data_dir/***
+
+# Clones the original upload data directory.
+#
+clone_root_data       = [cmdline] cp --no-cleanup -r $root_data_dir ./
+clone_root_data_clean = [cmdline] cp --no-cleanup -r $root_data_dir ./ &$data_dir/***
diff --git a/tests/upload/upload-bindist.testscript b/tests/upload/upload-bindist.testscript
new file mode 100644
index 0000000..d43c567
--- /dev/null
+++ b/tests/upload/upload-bindist.testscript
@@ -0,0 +1,126 @@
+# file      : tests/upload/upload-bindist.testscript
+# license   : MIT; see accompanying LICENSE file
+
+.include data.testscript
+
+: args
+{
+  : no-dir
+  :
+  $* 2>>~%EOE% != 0
+  %\[.+\] \[brep:error\] \[ref \] \[brep-upload-bindist\]: usage: .+brep-upload-bindist \[<options>\] <root> <dir>%
+  EOE
+
+  : no-root
+  :
+  $* $~/dir 2>>~%EOE% != 0
+  %\[.+\] \[brep:error\] \[ref dir\] \[brep-upload-bindist\]: usage: .+brep-upload-bindist \[<options>\] <root> <dir>%
+  EOE
+
+  : root-not-exist
+  :
+  : While at it, also test that the trailing slash is stripped from the
+  : directory paths.
+  :
+  $* $~/root/ $~/dir/ 2>>~%EOE% != 0
+    %\[.+\] \[brep:error\] \[ref dir\] \[brep-upload-bindist\]: '.+root' does not exist or is not a directory%
+    EOE
+
+  : data-not-exist
+  :
+  mkdir root;
+  $* $~/root $~/dir 2>>~%EOE% != 0
+    %\[.+\] \[brep:error\] \[ref dir\] \[brep-upload-bindist\]: '.+dir' does not exist or is not a directory%
+    EOE
+}
+
+: success
+:
+{
+  mkdir --no-cleanup bindist-root/ &bindist-root/***;
+
+  # Test the first upload.
+  #
+  $clone_data;
+
+  $* $~/bindist-root/ $~/$data_dir >>"EOO";
+    : 1
+    status: 200
+    message: binary distribution packages are published
+    reference: $request_id
+    EOO
+
+  timestamp = '2023-05-08T09:18:20Z';
+  tenant    = '4d4c8b36-56c5-42e0-91d1-58bfd1228002';
+  dir = [dir_path] bindist-root/$tenant/archive/fedora35/hello/libhello/1.1.0+10/;
+
+  test -f $dir/default/libhello-1.0.0+10.tar.xz;
+  test -f $dir/default-$timestamp/libhello-1.0.0+10.tar.xz;
+
+  # Repeat the upload using the same timestamp to make sure that we properly
+  # handle this situation (by adding the retry number as a suffix to the
+  # package configuration directory name).
+  #
+  $clone_data;
+
+  $* $~/bindist-root/ $~/$data_dir >>"EOO" &bindist-root/***;
+    : 1
+    status: 200
+    message: binary distribution packages are published
+    reference: $request_id
+    EOO
+
+  test -f $dir/default/libhello-1.0.0+10.tar.xz;
+  test -f $dir/default-$timestamp-0/libhello-1.0.0+10.tar.xz;
+  test -d $dir/default-$timestamp/ != 0;
+
+  # Test the second upload without --keep-previous option.
+  #
+  data_dir2   = 22222222-2222-2222-2222-222222222222;
+  request_id2 = $data_dir2;
+  timestamp2  = '2023-05-09T09:18:20Z';
+
+  cp --no-cleanup -r ../$data_dir ./$data_dir2;
+
+  sed -i -e "s%^\(id:\) .+\$%\\1 $request_id2%" \
+      $data_dir2/request.manifest;
+
+  sed -i -e "s%^\(timestamp:\) .+\$%\\1 $timestamp2%" \
+      $data_dir2/request.manifest;
+
+  $* $~/bindist-root/ $~/$data_dir2 >>"EOO";
+    : 1
+    status: 200
+    message: binary distribution packages are published
+    reference: $request_id2
+    EOO
+
+  test -f $dir/default/libhello-1.0.0+10.tar.xz;
+  test -f $dir/default-$timestamp2/libhello-1.0.0+10.tar.xz;
+  test -d $dir/default-$timestamp.0/ != 0;
+
+  # Test the third upload with --keep-previous option.
+  #
+  data_dir3   = 33333333-3333-3333-3333-333333333333;
+  request_id3 = $data_dir3;
+  timestamp3  = '2023-05-10T09:18:20Z';
+
+  cp --no-cleanup -r ../$data_dir ./$data_dir3;
+
+  sed -i -e "s%^\(id:\) .+\$%\\1 $request_id3%" \
+      $data_dir3/request.manifest;
+
+  sed -i -e "s%^\(timestamp:\) .+\$%\\1 $timestamp3%" \
+      $data_dir3/request.manifest;
+
+  $* --keep-previous $~/bindist-root/ $~/$data_dir3 >>"EOO";
+    : 1
+    status: 200
+    message: binary distribution packages are published
+    reference: $request_id3
+    EOO
+
+  test -f $dir/default/libhello-1.0.0+10.tar.xz;
+  test -f $dir/default-$timestamp3/libhello-1.0.0+10.tar.xz;
+  test -f $dir/default-$timestamp2/libhello-1.0.0+10.tar.xz
+}