(file) Return to commands.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/commands.mak between version 1.6 and 1.13

version 1.6, 2004/09/05 05:55:30 version 1.13, 2005/02/20 06:25:59
Line 1 
Line 1 
 ifndef OS  # Ensure that config.mak is included (so that the OS variable is set correctly)
  ifndef ROOT  ifndef ROOT
   ifdef PEGASUS_ROOT   ifdef PEGASUS_ROOT
      ROOT =  $(subst \,/,$(PEGASUS_ROOT))      ROOT =  $(subst \,/,$(PEGASUS_ROOT))
   else   else
      ROOT = .      ROOT = .
   endif   endif
  endif  
  include $(ROOT)/mak/config.mak  include $(ROOT)/mak/config.mak
 endif endif
  
Line 15 
Line 14 
   REDIRECTERROR = 2>&1   REDIRECTERROR = 2>&1
   CIMSERVER_START_SERVICE = cimserver -start $(CIMSERVER_CONFIG_OPTIONS)   CIMSERVER_START_SERVICE = cimserver -start $(CIMSERVER_CONFIG_OPTIONS)
   CIMSERVER_STOP_SERVICE = cimserver -stop   CIMSERVER_STOP_SERVICE = cimserver -stop
   SLEEP =      SLEEP = mu sleep
   REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus   REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus
   MUEXE = mu.exe   MUEXE = mu.exe
   MKDIRHIER = $(MUEXE) mkdirhier   MKDIRHIER = $(MUEXE) mkdirhier
   RMDIRHIER = $(MUEXE) rmdirhier   RMDIRHIER = $(MUEXE) rmdirhier
   ECHO = mu echo   ECHO = mu echo
       ECHO-E = mu echo-e
   COPY = mu copy   COPY = mu copy
   CHMOD =   CHMOD =
   CHOWN =   CHOWN =
Line 40 
Line 40 
   RMDIRHIER = rm -rf   RMDIRHIER = rm -rf
   CPDIRHIER = cp -R   CPDIRHIER = cp -R
   ECHO = echo   ECHO = echo
       ECHO-E = echo
   COPY = cp   COPY = cp
   TOUCH = touch   TOUCH = touch
   CAT = cat   CAT = cat
Line 86 
Line 87 
   SLEEP = sleep   SLEEP = sleep
   REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old   REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old
   MUEXE = mu   MUEXE = mu
   MKDIRHIER = $(MUEXE) mkdirhier      MKDIRHIER = mkdir -p
   RMDIRHIER = $(MUEXE) rmdirhier      RMDIRHIER = rm -rf
   ECHO = echo   ECHO = echo
       ECHO-E = mu echo-e
   COPY = cp   COPY = cp
   CHMOD =   CHMOD =
   CHOWN =   CHOWN =
Line 108 
Line 110 
   RMDIRHIER = rm -rf   RMDIRHIER = rm -rf
   CPDIRHIER = cp -R   CPDIRHIER = cp -R
   ECHO = echo   ECHO = echo
       ECHO-E = echo -e
   COPY = cp   COPY = cp
   TOUCH = touch   TOUCH = touch
   CAT = cat   CAT = cat
Line 142 
Line 145 
  
 ifeq ($(OS),zos) ifeq ($(OS),zos)
   STRIPCRS =   STRIPCRS =
   DIFF =      DIFF = diff
   REDIRECTERROR =   REDIRECTERROR =
   CIMSERVER_START_SERVICE = cimserver $(CIMSERVER_CONFIG_OPTIONS)   CIMSERVER_START_SERVICE = cimserver $(CIMSERVER_CONFIG_OPTIONS)
   CIMSERVER_STOP_SERVICE = cimserver -s   CIMSERVER_STOP_SERVICE = cimserver -s
Line 152 
Line 155 
   MKDIRHIER = mkdir -p   MKDIRHIER = mkdir -p
   RMDIRHIER = rm -rf   RMDIRHIER = rm -rf
   ECHO =   ECHO =
       ECHO-E =
   COPY = cp   COPY = cp
   CHMOD =   CHMOD =
   CHOWN =   CHOWN =
Line 160 
Line 164 
  
 ifeq ($(OS),VMS) ifeq ($(OS),VMS)
   STRIPCRS =   STRIPCRS =
   DIFF =      DIFF = mu compare
   REDIRECTERROR =   REDIRECTERROR =
   CIMSERVER_START_SERVICE = cimserver $(CIMSERVER_CONFIG_OPTIONS)   CIMSERVER_START_SERVICE = cimserver $(CIMSERVER_CONFIG_OPTIONS)
   CIMSERVER_STOP_SERVICE = cimserver -s   CIMSERVER_STOP_SERVICE = cimserver -s
Line 170 
Line 174 
   MKDIRHIER = $(MUEXE) mkdirhier   MKDIRHIER = $(MUEXE) mkdirhier
   RMDIRHIER = $(MUEXE) rmdirhier   RMDIRHIER = $(MUEXE) rmdirhier
   ECHO =   ECHO =
       ECHO-E =
   CHMOD =   CHMOD =
   CHOWN =   CHOWN =
   CHGRP =   CHGRP =
Line 177 
Line 182 
  
 ifeq ($(OS),aix) ifeq ($(OS),aix)
   STRIPCRS =   STRIPCRS =
   DIFF =      DIFF = diff
   REDIRECTERROR =   REDIRECTERROR =
   CIMSERVER_START_SERVICE = cimserver $(CIMSERVER_CONFIG_OPTIONS)   CIMSERVER_START_SERVICE = cimserver $(CIMSERVER_CONFIG_OPTIONS)
   CIMSERVER_STOP_SERVICE = cimserver -s   CIMSERVER_STOP_SERVICE = cimserver -s
Line 187 
Line 192 
   MKDIRHIER = mkdir -p   MKDIRHIER = mkdir -p
   RMDIRHIER = rm -rf   RMDIRHIER = rm -rf
   ECHO = echo   ECHO = echo
       ECHO-E =
   COPY = cp   COPY = cp
   CHMOD =   CHMOD =
   CHOWN =   CHOWN =
Line 243 
Line 249 
 createrandomseed: CMDSFORCE createrandomseed: CMDSFORCE
         $(GENERATE_RANDSEED) $(FILENAME)         $(GENERATE_RANDSEED) $(FILENAME)
  
   # The runTestSuite option restarts the CIM Server
   # with a designated set of configuration options (i.e.,
   # CIMSERVER_CONFIG_OPTIONS) and then runs a specified
   # set of tests (i.e., TESTSUITE_CMDS). After the tests
   # have been executed, the CIM Server is stopped.
   #
   # To call runTestSuite, you simply (1) define the
   # configuration options, (2) define the set of
   # tests and (3) call commands.mak with the appropriate
   # parameters.  Note: when specifying the set of tests
   # @@ is used as a replacement for blank. E.g., the
   # following sequence can be used to enable the
   # HTTP connection, disable the HTTPS connection and
   # run an osinfo, TestClient, OSTestClient,
   # and InvokeMethod2 test.
   #
   #runTestSuiteTest_CONFIG_OPTIONS = enableHttpConnection=true enableHttpsConnection=false
   #runTestSuiteTest_TEST_CMDS = \
   #   osinfo@@-hlocalhost@@-p5988@@-uguest@@-wguest\
   #   TestClient@@-local \
   #   OSTestClient \
   #   $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Pegasus/Client/tests/InvokeMethod2@@poststarttests
   #
   #runTestSuiteTest: CMDSFORCE
   #       $(MAKE) -f $(ROOT)/mak/commands.mak runTestSuite CIMSERVER_CONFIG_OPTIONS="$(runTestSuiteTest_CONFIG_OPTIONS)" TESTSUITE_CMDS="$(runTestSuiteTest_TEST_CMDS)"
   
   runTestSuite: CMDSFORCE
           $(MAKE) -f $(ROOT)/mak/commands.mak cimstop_IgnoreError
           $(MAKE) -f $(ROOT)/mak/commands.mak cimstart CIMSERVER_CONFIG_OPTIONS=$(CIMSERVER_CONFIG_OPTIONS)
           $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i));)
           $(MAKE) -f $(ROOT)/mak/commands.mak cimstop
   
 testCommands: CMDSFORCE testCommands: CMDSFORCE
         $(MAKE) -f $(ROOT)/mak/commands.mak sleep TIME=10         $(MAKE) -f $(ROOT)/mak/commands.mak sleep TIME=10
         $(MAKE) -f $(ROOT)/mak/commands.mak rmdirhier_IgnoreError DIRNAME=$(TMP_DIR)/PegasusTestDirA/PegasusTestDirB         $(MAKE) -f $(ROOT)/mak/commands.mak rmdirhier_IgnoreError DIRNAME=$(TMP_DIR)/PegasusTestDirA/PegasusTestDirB

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.13
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2