From 42467152acbac9d4604e448694cf5943c8c194fe Mon Sep 17 00:00:00 2001
From: Constantin Michael <constantin@codesynthesis.com>
Date: Thu, 20 Oct 2011 21:24:30 +0200
Subject: Improve temporary makefile layout

---
 common/makefile | 52 ++++++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

(limited to 'common/makefile')

diff --git a/common/makefile b/common/makefile
index 603ea60..ce73bd5 100644
--- a/common/makefile
+++ b/common/makefile
@@ -5,39 +5,43 @@
 
 include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make
 
-# @@ Uncomment all tests once Oracle tests have been fully
-# implemented
-#
 tests :=            \
 auto                \
+callback            \
+composite           \
+const               \
 container           \
+ctor                \
+default             \
+enum                \
+erase-query         \
+inheritance         \
+inverse             \
 lazy-ptr            \
 lifecycle           \
+query               \
+relationship        \
+relationship-query  \
 schema              \
+template            \
+view                \
 wrapper
 
-#auto                \
-#callback            \
-#composite           \
-#const               \
-#container           \
-#ctor                \
-#default             \
-#enum                \
-#erase-query         \
-#inheritance         \
-#inverse             \
-#lazy-ptr            \
-#lifecycle           \
-#query               \
-#relationship        \
-#relationship-query  \
-#schema              \
-#template            \
-#view                \
-#wrapper
+thread_tests := threads
 
-#thread_tests := threads
+# @@ Remove overrides once Oracle has been fully integrated.
+#
+ifeq ($(db_id),oracle)
+tests :=           \
+auto               \
+container          \
+lazy-ptr           \
+lifecycle          \
+schema             \
+wrapper
+
+thread_tests :=
+endif
 
 all_tests := $(tests) $(thread_tests)
 build_tests := $(tests) $(thread_tests)
-- 
cgit v1.1