9 files changed, 45 insertions, 18 deletions
diff --git a/odb-tests/sqlite/attach/buildfile b/odb-tests/sqlite/attach/buildfile
index 959f050..bff5435 100644
--- a/odb-tests/sqlite/attach/buildfile
+++ b/odb-tests/sqlite/attach/buildfile
@@ -1,8 +1,11 @@
 # file      : sqlite/attach/buildfile
 # license   : GNU GPL v2; see accompanying LICENSE file
 
-assert ($sqlite && !$multi || $build.meta_operation == 'dist') \
-"sqlite should be configured via config.odb_tests.database variable as a single database"
+if ($build.meta_operation != 'dist')
+{
+  assert ($sqlite) "sqlite should be configured for this test"
+  assert (!$multi) "multi-database mode is not supported by this test"
+}
 
 import libodb = libodb%lib{odb}
 
diff --git a/odb-tests/sqlite/auto/buildfile b/odb-tests/sqlite/auto/buildfile
index 2c70b7c..46bcc39 100644
--- a/odb-tests/sqlite/auto/buildfile
+++ b/odb-tests/sqlite/auto/buildfile
@@ -1,8 +1,11 @@
 # file      : sqlite/auto/buildfile
 # license   : GNU GPL v2; see accompanying LICENSE file
 
-assert ($sqlite && !$multi || $build.meta_operation == 'dist') \
-"sqlite should be configured via config.odb_tests.database variable as a single database"
+if ($build.meta_operation != 'dist')
+{
+  assert ($sqlite) "sqlite should be configured for this test"
+  assert (!$multi) "multi-database mode is not supported by this test"
+}
 
 import libodb = libodb%lib{odb}
 
diff --git a/odb-tests/sqlite/custom/buildfile b/odb-tests/sqlite/custom/buildfile
index 3325762..de199b4 100644
--- a/odb-tests/sqlite/custom/buildfile
+++ b/odb-tests/sqlite/custom/buildfile
@@ -1,8 +1,11 @@
 # file      : sqlite/custom/buildfile
 # license   : GNU GPL v2; see accompanying LICENSE file
 
-assert ($sqlite && !$multi || $build.meta_operation == 'dist') \
-"sqlite should be configured via config.odb_tests.database variable as a single database"
+if ($build.meta_operation != 'dist')
+{
+  assert ($sqlite) "sqlite should be configured for this test"
+  assert (!$multi) "multi-database mode is not supported by this test"
+}
 
 import libodb = libodb%lib{odb}
 
diff --git a/odb-tests/sqlite/database/buildfile b/odb-tests/sqlite/database/buildfile
index e74ab1a..01e4c38 100644
--- a/odb-tests/sqlite/database/buildfile
+++ b/odb-tests/sqlite/database/buildfile
@@ -1,8 +1,11 @@
 # file      : sqlite/database/buildfile
 # license   : GNU GPL v2; see accompanying LICENSE file
 
-assert ($sqlite && !$multi || $build.meta_operation == 'dist') \
-"sqlite should be configured via config.odb_tests.database variable as a single database"
+if ($build.meta_operation != 'dist')
+{
+  assert ($sqlite) "sqlite should be configured for this test"
+  assert (!$multi) "multi-database mode is not supported by this test"
+}
 
 import libs = libodb-sqlite%lib{odb-sqlite}
 
diff --git a/odb-tests/sqlite/native/buildfile b/odb-tests/sqlite/native/buildfile
index 49aa05b..76f6b53 100644
--- a/odb-tests/sqlite/native/buildfile
+++ b/odb-tests/sqlite/native/buildfile
@@ -1,8 +1,11 @@
 # file      : sqlite/native/buildfile
 # license   : GNU GPL v2; see accompanying LICENSE file
 
-assert ($sqlite && !$multi || $build.meta_operation == 'dist') \
-"sqlite should be configured via config.odb_tests.database variable as a single database"
+if ($build.meta_operation != 'dist')
+{
+  assert ($sqlite) "sqlite should be configured for this test"
+  assert (!$multi) "multi-database mode is not supported by this test"
+}
 
 import libs  = libodb-sqlite%lib{odb-sqlite}
 import libs += lib{common}
diff --git a/odb-tests/sqlite/stream/buildfile b/odb-tests/sqlite/stream/buildfile
index fb8f605..e5baeb5 100644
--- a/odb-tests/sqlite/stream/buildfile
+++ b/odb-tests/sqlite/stream/buildfile
@@ -1,8 +1,11 @@
 # file      : sqlite/stream/buildfile
 # license   : GNU GPL v2; see accompanying LICENSE file
 
-assert ($sqlite && !$multi || $build.meta_operation == 'dist') \
-"sqlite should be configured via config.odb_tests.database variable as a single database"
+if ($build.meta_operation != 'dist')
+{
+  assert ($sqlite) "sqlite should be configured for this test"
+  assert (!$multi) "multi-database mode is not supported by this test"
+}
 
 import libodb        = libodb%lib{odb}
 import libodb_sqlite = libodb-sqlite%lib{odb-sqlite}
diff --git a/odb-tests/sqlite/transaction/buildfile b/odb-tests/sqlite/transaction/buildfile
index e29092d..1653c29 100644
--- a/odb-tests/sqlite/transaction/buildfile
+++ b/odb-tests/sqlite/transaction/buildfile
@@ -1,8 +1,11 @@
 # file      : sqlite/transaction/buildfile
 # license   : GNU GPL v2; see accompanying LICENSE file
 
-assert ($sqlite && !$multi || $build.meta_operation == 'dist') \
-"sqlite should be configured via config.odb_tests.database variable as a single database"
+if ($build.meta_operation != 'dist')
+{
+  assert ($sqlite) "sqlite should be configured for this test"
+  assert (!$multi) "multi-database mode is not supported by this test"
+}
 
 import libodb = libodb%lib{odb}
 
diff --git a/odb-tests/sqlite/truncation/buildfile b/odb-tests/sqlite/truncation/buildfile
index 9a014e6..232b030 100644
--- a/odb-tests/sqlite/truncation/buildfile
+++ b/odb-tests/sqlite/truncation/buildfile
@@ -1,8 +1,11 @@
 # file      : sqlite/truncation/buildfile
 # license   : GNU GPL v2; see accompanying LICENSE file
 
-assert ($sqlite && !$multi || $build.meta_operation == 'dist') \
-"sqlite should be configured via config.odb_tests.database variable as a single database"
+if ($build.meta_operation != 'dist')
+{
+  assert ($sqlite) "sqlite should be configured for this test"
+  assert (!$multi) "multi-database mode is not supported by this test"
+}
 
 import libodb = libodb%lib{odb}
 
diff --git a/odb-tests/sqlite/types/buildfile b/odb-tests/sqlite/types/buildfile
index 1bf719d..305ecba 100644
--- a/odb-tests/sqlite/types/buildfile
+++ b/odb-tests/sqlite/types/buildfile
@@ -1,8 +1,11 @@
 # file      : sqlite/types/buildfile
 # license   : GNU GPL v2; see accompanying LICENSE file
 
-assert ($sqlite && !$multi || $build.meta_operation == 'dist') \
-"sqlite should be configured via config.odb_tests.database variable as a single database"
+if ($build.meta_operation != 'dist')
+{
+  assert ($sqlite) "sqlite should be configured for this test"
+  assert (!$multi) "multi-database mode is not supported by this test"
+}
 
 import libodb = libodb%lib{odb}