diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2024-03-01 08:47:13 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2024-03-01 08:47:13 +0200 |
| commit | e93af92d53e7bc291a56d5c24a72d5743befaee8 (patch) | |
| tree | 9825cd98fec36ccfa89fb86ae120db675393a3f2 | |
| parent | 015e92cecf875e6f77958e781dffca379b30d873 (diff) | |
Temporarily hide tests dependencies behind config.odb_tests.develop
This allows us both to get proper semantics for bdep and to CI.
| -rw-r--r-- | libodb-mssql/manifest | 6 | ||||
| -rw-r--r-- | libodb-mysql/manifest | 6 | ||||
| -rw-r--r-- | libodb-oracle/manifest | 6 | ||||
| -rw-r--r-- | libodb-pgsql/manifest | 6 | ||||
| -rw-r--r-- | odb-tests/build/root.build | 4 |
5 files changed, 20 insertions, 8 deletions
diff --git a/libodb-mssql/manifest b/libodb-mssql/manifest index 535560c..856b67a 100644 --- a/libodb-mssql/manifest +++ b/libodb-mssql/manifest @@ -25,8 +25,10 @@ depends: * bpkg >= 0.16.0- depends: libodb == $ depends: * cli ^1.2.0- ? ($config.libodb_mssql.develop) -#tests: odb-tests == $ \ -# ? (!$defined(config.odb_tests.database)) config.odb_tests.database=mssql +# @@ TMP: drop develop (also drop in odb-tests/build/root.build). +# +tests: odb-tests == $ \ + ? ($config.odb_tests.develop && !$defined(config.odb_tests.database)) config.odb_tests.database=mssql # @@ TMP # diff --git a/libodb-mysql/manifest b/libodb-mysql/manifest index 83926a0..c37053c 100644 --- a/libodb-mysql/manifest +++ b/libodb-mysql/manifest @@ -25,8 +25,10 @@ depends: libmysqlclient >= 5.0.3 depends: libodb == $ depends: * cli ^1.2.0- ? ($config.libodb_mysql.develop) -#tests: odb-tests == $ \ -# ? (!$defined(config.odb_tests.database)) config.odb_tests.database=mysql +# @@ TMP: drop develop (also drop in odb-tests/build/root.build). +# +tests: odb-tests == $ \ + ? ($config.odb_tests.develop && !$defined(config.odb_tests.database)) config.odb_tests.database=mysql # @@ TMP # diff --git a/libodb-oracle/manifest b/libodb-oracle/manifest index d39d166..7a8ae9f 100644 --- a/libodb-oracle/manifest +++ b/libodb-oracle/manifest @@ -24,8 +24,10 @@ depends: * bpkg >= 0.16.0- depends: libodb == $ depends: * cli ^1.2.0- ? ($config.libodb_oracle.develop) -#tests: odb-tests == $ \ -# ? (!$defined(config.odb_tests.database)) config.odb_tests.database=oracle +# @@ TMP: drop develop (also drop in odb-tests/build/root.build). +# +tests: odb-tests == $ \ + ? ($config.odb_tests.develop && !$defined(config.odb_tests.database)) config.odb_tests.database=oracle # @@ TMP # diff --git a/libodb-pgsql/manifest b/libodb-pgsql/manifest index e9176f0..9825812 100644 --- a/libodb-pgsql/manifest +++ b/libodb-pgsql/manifest @@ -24,8 +24,10 @@ depends: libpq >=7.4.0 depends: libodb == $ depends: * cli ^1.2.0- ? ($config.libodb_pgsql.develop) -#tests: odb-tests == $ \ -# ? (!$defined(config.odb_tests.database)) config.odb_tests.database=pgsql +# @@ TMP: drop develop (also drop in odb-tests/build/root.build). +# +tests: odb-tests == $ \ + ? ($config.odb_tests.develop && !$defined(config.odb_tests.database)) config.odb_tests.database=pgsql # @@ TMP # diff --git a/odb-tests/build/root.build b/odb-tests/build/root.build index 071a97f..6f9c144 100644 --- a/odb-tests/build/root.build +++ b/odb-tests/build/root.build @@ -18,6 +18,10 @@ xml{*}: extension = xml skeleton = ($build.mode == 'skeleton') +# @@ TMP: remove once no longer used by libodb-<db>. +# +config [bool] config.odb_tests.develop ?= false + # List of the identifiers of the databases to compile and run the tests # against. The valid identifiers are mysql, sqlite, pgsql, oracle, and mssql. # |