aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bbot/worker/worker.cxx5
-rw-r--r--tests/integration/testscript4
2 files changed, 6 insertions, 3 deletions
diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx
index 28a7a5b..a12a266 100644
--- a/bbot/worker/worker.cxx
+++ b/bbot/worker/worker.cxx
@@ -1445,7 +1445,10 @@ build (size_t argc, const char* argv[])
//
// b.test-installed.configure
//
- dir_path subprj_src_dir (build_dir / pkg_dir / d);
+ dir_path subprj_src_dir (exists (dist_src)
+ ? dist_src / d
+ : build_dir / pkg_dir / d);
+
dir_path subprj_out_dir (out_dir / d);
r.status |= run_b (
diff --git a/tests/integration/testscript b/tests/integration/testscript
index fe76c13..3f10d2e 100644
--- a/tests/integration/testscript
+++ b/tests/integration/testscript
@@ -50,8 +50,8 @@ controller = --fake-request ../task --dump-result
pkg = libhello
ver = 1.0.0+7
-#rep_url = 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_url = "https://git.build2.org/hello/libhello.git#1.0"
+#rep_type = git
rep_url = https://stage.build2.org/1
rep_type = pkg
rfp = yes