diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2018-05-29 13:11:47 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2018-05-29 13:11:47 +0300 |
| commit | 8cd5bfaa194da46aa7f4d2f8477d8691431bdb75 (patch) | |
| tree | 2173026c579479f49106deb939fdb8912d9b2611 | |
| parent | 82f975e377bd9d148a6a7f4b508f29d609ff3524 (diff) | |
Rename b.test-installed* worker step ids to b.test-installed*
| -rw-r--r-- | bbot/worker/worker.cxx | 10 | ||||
| -rw-r--r-- | tests/integration/testscript | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx index f0a366c..5fff9bc 100644 --- a/bbot/worker/worker.cxx +++ b/bbot/worker/worker.cxx @@ -296,9 +296,9 @@ build (size_t argc, const char* argv[]) "bpkg.update.update", "bpkg.test.test", "bpkg.install.install", - "b.test_installed.create", - "b.test_installed.configure", - "b.test_installed.test", + "b.test-installed.create", + "b.test-installed.configure", + "b.test-installed.test", "bpkg.uninstall.uninstall"}; // Split the argument into prefix (empty if not present) and unquoted @@ -335,7 +335,7 @@ build (size_t argc, const char* argv[]) else { args.emplace ("bpkg.configure.create", a.second); - args.emplace ("b.test_installed.create", move (a.second)); + args.emplace ("b.test-installed.create", move (a.second)); } }; @@ -385,7 +385,7 @@ build (size_t argc, const char* argv[]) if (mod && !v->first.empty () && v->first != "bpkg.configure.create" && - v->first != "b.test_installed.create") + v->first != "b.test-installed.create") fail << "invalid module prefix in '" << a << "'"; add_arg (mod ? modules : env_args, move (*v)); diff --git a/tests/integration/testscript b/tests/integration/testscript index be4a4f8..9406c43 100644 --- a/tests/integration/testscript +++ b/tests/integration/testscript @@ -75,9 +75,9 @@ rfp = 37:CE:2C:A5:1D:CF:93:81:D7:07:46:AD:66:B3:C3:90:83:B8:96:9E:34:F0:E7:B3:A2 # config = "config.install.root='$~/install' \ bpkg:--fetch-timeout=60 \ -b.test_installed.configure:config.cc.loptions=-L'$~/install/lib' \ -b.test_installed.configure:config.bin.rpath='$~/install/lib' \ -b.test_installed:--progress" +b.test-installed.configure:config.cc.loptions=-L'$~/install/lib' \ +b.test-installed.configure:config.bin.rpath='$~/install/lib' \ +b.test-installed:--progress" +cat <<"EOI" >=task : 1 |