diff options
| -rw-r--r-- | bbot/worker/worker.cxx | 14 | ||||
| -rw-r--r-- | doc/manual.cli | 2 | ||||
| -rw-r--r-- | tests/integration/testscript | 22 |
3 files changed, 33 insertions, 5 deletions
diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx index 051cc15..d413912 100644 --- a/bbot/worker/worker.cxx +++ b/bbot/worker/worker.cxx @@ -1547,7 +1547,9 @@ build (size_t argc, const char* argv[]) prefix != "bpkg.bindist.archive" && prefix != "bbot.sys-install" && prefix != "bbot.sys-install.ldconfig" && + prefix != "b.test-installed.create" && prefix != "b.test-installed.test" && + prefix != "bpkg.test-separate-installed.create" && prefix != "bpkg.test-separate-installed.update" && prefix != "bpkg.test-separate-installed.test" && prefix != "bbot.bindist.upload" && @@ -5021,7 +5023,8 @@ build (size_t argc, const char* argv[]) // Run internal tests. // - if (has_internal_tests) + if (has_internal_tests && + !step_disabled (step_id::b_test_installed_create)) { // Create the configuration. // @@ -5165,7 +5168,8 @@ build (size_t argc, const char* argv[]) } // // Fail if the breakpoint refers to some of the b.test-installed.* - // steps but the package doesn't have any internal tests. + // steps but the package doesn't have any internal tests or the + // b.test-installed.create step is disabled. // else if (bkp_step && *bkp_step >= step_id::b_test_installed_create && @@ -5180,7 +5184,8 @@ build (size_t argc, const char* argv[]) // Note that we only build runtime tests for target packages and for // host packages in self-hosted configurations. // - if (has_runtime_tests || has_buildtime_tests) + if ((has_runtime_tests || has_buildtime_tests) && + !step_disabled (step_id::bpkg_test_separate_installed_create)) { // Stash the absolute path of the initial build target // configuration. @@ -5863,7 +5868,8 @@ build (size_t argc, const char* argv[]) // // Fail if the breakpoint refers to some of the // bpkg.test-separate-installed.* steps but the package has no - // external tests. + // external tests or the bpkg.test-separate-installed.create step is + // disabled. // else if (bkp_step && *bkp_step >= step_id::bpkg_test_separate_installed_create && diff --git a/doc/manual.cli b/doc/manual.cli index 1fb0184..9c57197 100644 --- a/doc/manual.cli +++ b/doc/manual.cli @@ -2485,7 +2485,9 @@ bbot.sys-install # bbot.sys-install.ldconfig +b.test-installed.create b.test-installed.test +bpkg.test-separate-installed.create bpkg.test-separate-installed.update bpkg.test-separate-installed.test diff --git a/tests/integration/testscript b/tests/integration/testscript index dc43e5c..2a181f2 100644 --- a/tests/integration/testscript +++ b/tests/integration/testscript @@ -76,6 +76,7 @@ rfp = yes #package_config = 'package-config: { config.libhello.extras=true }+ libhello' #package_config = 'package-config: +bbot.install.ldconfig:' #package_config = 'package-config: -bpkg.install:' +#package_config = 'package-config: -b.test-installed.create:' #\ package_config = "package-config: \\ @@ -266,6 +267,7 @@ tests="tests: * cli-tests == $ver examples: * cli-examples == $ver" host='host: true' #\ +#package_config = "package-config: -b.test-installed.create: -bpkg.test-separate-installed.create:" #\ package_config = "package-config: \\ @@ -372,12 +374,30 @@ sys:libz/* #\ pkg = odb -ver = 2.5.0-b.28.20241009172401.fa4b44129d84 +ver = 2.5.0-b.28.20241111061718.ed3e5d842791 rep_url = "https://git.codesynthesis.com/odb/odb.git#master" rep_type = git rfp = yes requires='requires: host' host='host: true' +package_config = 'package-config: +\ ++bpkg.bindist.archive: ++bbot.bindist.upload: +bpkg.bindist.archive:--recursive=auto + +bpkg.bindist.archive:--archive-install-root=/tmp +bbot.sys-install:config.install.root=/tmp/install +bbot.sys-install.tar.extract:--directory=/tmp/install +bbot.sys-install.tar.extract:--strip-components=1 + +bpkg.create:config.bin.lib=static +bpkg.create:config.cc.coptions=-fPIC + +b.create:config.cc.coptions="-Wall -Werror -O2 -fstack-protector-strong " + +b.create:config.cxx.std=c++11 +\' #\ #\ |