aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bbot/worker/worker.cxx16
-rw-r--r--tests/integration/testscript8
2 files changed, 13 insertions, 11 deletions
diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx
index d914d01..f0a366c 100644
--- a/bbot/worker/worker.cxx
+++ b/bbot/worker/worker.cxx
@@ -539,7 +539,7 @@ build (size_t argc, const char* argv[])
"--yes",
step_args (config_args, step_id::bpkg_configure_build),
step_args (env_args, step_id::bpkg_configure_build),
- tm.name + '/' + tm.version.string ());
+ tm.name.string () + '/' + tm.version.string ());
if (!r.status)
break;
@@ -561,7 +561,7 @@ build (size_t argc, const char* argv[])
"update",
step_args (config_args, step_id::bpkg_update_update),
step_args (env_args, step_id::bpkg_update_update),
- tm.name);
+ tm.name.string ());
if (!r.status)
break;
@@ -583,7 +583,7 @@ build (size_t argc, const char* argv[])
"test",
step_args (config_args, step_id::bpkg_test_test),
step_args (env_args, step_id::bpkg_test_test),
- tm.name);
+ tm.name.string ());
if (!r.status)
break;
@@ -625,7 +625,7 @@ build (size_t argc, const char* argv[])
"install",
step_args (config_args, step_id::bpkg_install_install),
step_args (env_args, step_id::bpkg_install_install),
- tm.name);
+ tm.name.string ());
if (!r.status)
break;
@@ -637,7 +637,7 @@ build (size_t argc, const char* argv[])
//
// The package tests subdirectory path (may not exist).
//
- dir_path tests_dir (tm.name + "-" + tm.version.string ());
+ dir_path tests_dir (tm.name.string () + "-" + tm.version.string ());
tests_dir /= "tests";
// We will consider the tests subdirectory to be a subproject if it
@@ -749,7 +749,7 @@ build (size_t argc, const char* argv[])
"uninstall",
step_args (config_args, step_id::bpkg_uninstall_uninstall),
step_args (env_args, step_id::bpkg_uninstall_uninstall),
- tm.name);
+ tm.name.string ());
if (!r.status)
break;
@@ -915,8 +915,8 @@ startup ()
// "unknown" values for the package name and version.
//
result_manifest rm {
- tm.name.empty () ? "unknown" : tm.name,
- tm.version.empty () ? bpkg::version ("0") : tm.version,
+ tm.name.empty () ? bpkg::package_name ("unknown") : tm.name,
+ tm.version.empty () ? bpkg::version ("0") : tm.version,
result_status::abnormal,
operation_results {}
};
diff --git a/tests/integration/testscript b/tests/integration/testscript
index 97fb2a5..be4a4f8 100644
--- a/tests/integration/testscript
+++ b/tests/integration/testscript
@@ -50,8 +50,10 @@ controller = --fake-request ../task --dump-result
pkg = libhello
ver = 1.0.0
-rep = https://build2.org/pkg/1/hello/stable
-rfp = FF:DF:7D:38:67:4E:C3:82:65:7E:EE:1F:D4:80:EC:56:C4:33:5B:65:3F:9B:29:9A:30:56:B9:77:B9:F2:01:94
+#rep = https://build2.org/pkg/1/hello/stable
+#rfp = FF:DF:7D:38:67:4E:C3:82:65:7E:EE:1F:D4:80:EC:56:C4:33:5B:65:3F:9B:29:9A:30:56:B9:77:B9:F2:01:94
+rep = https://hello.stage.build2.org/1/stable/
+rfp = yes
#\
pkg = bpkg
@@ -122,5 +124,5 @@ a = $0
chmod ugo+x $target;
sleep $wait;
$w --verbose 3 --startup --tftp-host $tftp --environments $~ \
- &build/*** &?build-installed/*** &manifest 2>|
+ &build/*** &?build-installed/*** &task.manifest 2>|
}