summaryrefslogtreecommitdiffstats
path: root/mak
diff options
context:
space:
mode:
authorjim.wunderlich <jim.wunderlich>2005-04-28 11:52:45 +0000
committerjim.wunderlich <jim.wunderlich>2005-04-28 11:52:45 +0000
commit99fbbed8303c51a6da1c13f46f0dae200178358f (patch)
treefe7a46ecb0d6e334b22eb0464fd66bfa61671db8 /mak
parenta78416cfb7f6afe039b5e87e5f7e5e135ff751b7 (diff)
downloadtog-pegasus-99fbbed8303c51a6da1c13f46f0dae200178358f.zip
tog-pegasus-99fbbed8303c51a6da1c13f46f0dae200178358f.tar.gz
tog-pegasus-99fbbed8303c51a6da1c13f46f0dae200178358f.tar.xz
BUG#: 3397
TITLE: Can't run all system tests on a binary repository DESCRIPTION: - Made changes to make file to add -M$(REPOSITORY_MODE) to cimmofl command line to allow building the test repository in binary mode in order to run the test against a binary repository. - Also fixes bug 3420 to allow the REPOSITORY_XXX build varialbes to be set from the environment.
Diffstat (limited to 'mak')
-rw-r--r--mak/config.mak28
1 files changed, 28 insertions, 0 deletions
diff --git a/mak/config.mak b/mak/config.mak
index 3c64daa..0bf859c 100644
--- a/mak/config.mak
+++ b/mak/config.mak
@@ -63,16 +63,44 @@ LIB_DIR = $(HOME_DIR)/lib
# define the location for the compiled messages
MSG_ROOT = $(HOME_DIR)/msg
+#############################################################################
+## The following REPOSITORY_XXX variables are only used within the
+## makefiles for building the repository (cimmofl) and running the tests.
+## They have no effect on CIMconfig initial startup configuration.
+
+#
# define the location for the repository
+#
+# NOTE: There is another variable efined in many of the test makefiles
+# called REPOSITORYDIR. It is a local variable in each of those Makefiles
+# to localally control where the temporay small repository they
+# build, use and then delete is located. Most of the time it is set to TMP_DIR.
+#
+ifndef REPOSITORY_DIR
REPOSITORY_DIR = $(HOME_DIR)
+endif
+
+#
+# WARNING: The REPOSITORY_NAME varible is not used by all the test,
+# many of them are still hardcoded to "repository". What this means
+# is that you can change the repository name and build it. But you
+# cannot run the test without many of them failing
+#
+ifndef REPOSITORY_NAME
REPOSITORY_NAME = repository
+endif
+
REPOSITORY_ROOT = $(REPOSITORY_DIR)/$(REPOSITORY_NAME)
# define the repository mode
# XML = XML format
# BIN = Binary format
#
+ifndef REPOSITORY_MODE
REPOSITORY_MODE = XML
+endif
+
+###########################################################################
# The two variables, CIM_SCHEMA_DIR and CIM_SCHEMA_VER,
# are used to control the version of the CIM Schema