Add support for testing via odb-tests to default build configuration for libodb-pgsql and libodb-mysql

3 files changed, 26 insertions, 35 deletions

diff --git a/libodb-mysql/manifest b/libodb-mysql/manifest
index c37053c..e707269 100644
--- a/libodb-mysql/manifest
+++ b/libodb-mysql/manifest
@@ -25,25 +25,22 @@ depends: libmysqlclient >= 5.0.3
 depends: libodb == $
 depends: * cli ^1.2.0- ? ($config.libodb_mysql.develop)
 
-# @@ 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
+  ? (!$defined(config.odb_tests.database)) config.odb_tests.database=mysql
 
-# @@ TMP
-#
 builds: all
-#builds: all mysql
 builds: -wasm
 builds: -( +windows &gcc ) ; MinGW GCC is not supported by libmysqlclient.
 
-# Only build this package configuration where it can be tested via odb-tests
-# package (see its manifest for details).
-#
-#multi-builds: mysql
-#multi-build-config:
-#\
-#{ 'config.odb_tests.database=mysql sqlite' }+ odb-tests
-#;
-#Enable testing in dynamic multi-database mode.
-#\
+build-auxiliary: *-mysql_*
+
+default-build-config:
+\
+{
+  config.odb_tests.database=mysql
+  config.odb_tests.mysql.user=$getenv(DATABASE_USER)
+  config.odb_tests.mysql.database=$getenv(DATABASE_NAME)
+  config.odb_tests.mysql.host=$getenv(DATABASE_HOST)
+  config.odb_tests.mysql.port=$getenv(DATABASE_PORT)
+}+ odb-tests
+\
diff --git a/libodb-pgsql/manifest b/libodb-pgsql/manifest
index 9825812..7763b8d 100644
--- a/libodb-pgsql/manifest
+++ b/libodb-pgsql/manifest
@@ -24,24 +24,21 @@ depends: libpq >=7.4.0
 depends: libodb == $
 depends: * cli ^1.2.0- ? ($config.libodb_pgsql.develop)
 
-# @@ 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
+  ? (!$defined(config.odb_tests.database)) config.odb_tests.database=pgsql
 
-# @@ TMP
-#
 builds: all
-#builds: all pgsql
 builds: -wasm
 
-# Only build this package configuration where it can be tested via odb-tests
-# package (see its manifest for details).
-#
-#multi-builds: pgsql
-#multi-build-config:
-#\
-#{ 'config.odb_tests.database=pgsql sqlite' }+ odb-tests
-#;
-#Enable testing in dynamic multi-database mode.
-#\
+build-auxiliary: *-postgresql_*
+
+default-build-config:
+\
+{
+  config.odb_tests.database=pgsql
+  config.odb_tests.pgsql.user=$getenv(DATABASE_USER)
+  config.odb_tests.pgsql.database=$getenv(DATABASE_NAME)
+  config.odb_tests.pgsql.host=$getenv(DATABASE_HOST)
+  config.odb_tests.pgsql.port=$getenv(DATABASE_PORT)
+}+ odb-tests
+\
diff --git a/odb-tests/manifest b/odb-tests/manifest
index d3d0ad2..80e943a 100644
--- a/odb-tests/manifest
+++ b/odb-tests/manifest
@@ -12,10 +12,7 @@ doc-url: https://www.codesynthesis.com/products/odb/doc/manual.xhtml
 src-url: https://git.codesynthesis.com/cgit/odb/odb/
 email: odb-users@codesynthesis.com ; Mailing list
 
-# @@ TMP
-#
 builds: all
-#builds: mysql sqlite pgsql oracle mssql
 #
 # @@ BUILD2 The odb dependency can only be built with GCC. However, shouldn't
 #           we test that the odb-generated mappings can be compiled by other