diff options
| author | Constantin Michael <constantin@codesynthesis.com> | 2011-10-20 21:24:30 +0200 |
|---|---|---|
| committer | Constantin Michael <constantin@codesynthesis.com> | 2011-10-21 13:29:10 +0200 |
| commit | 42467152acbac9d4604e448694cf5943c8c194fe (patch) | |
| tree | eb98db30726b8faa907db4df40440d75c2853c9e | |
| parent | 77012915e5755f82982ceb18035bb8e56878848d (diff) | |
Improve temporary makefile layout
| -rw-r--r-- | common/makefile | 52 |
1 files changed, 28 insertions, 24 deletions
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) |