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

Diff for /pegasus/mak/commands.mak between version 1.7.2.1 and 1.7.2.3

version 1.7.2.1, 2005/02/24 18:49:07 version 1.7.2.3, 2005/02/25 19:35:40
Line 13 
Line 13 
   STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)   STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)
   DIFF = mu compare   DIFF = mu compare
   REDIRECTERROR = 2>&1   REDIRECTERROR = 2>&1
   CIMSERVER_START_SERVICE = cimserver -start $(CIMSERVER_CONFIG_OPTIONS)    CIMSERVER_START_SERVICE =  $(CIMSERVER_PATH)cimserver -start $(CIMSERVER_CONFIG_OPTIONS)
   CIMSERVER_STOP_SERVICE = cimserver -stop    CIMSERVER_STOP_SERVICE =  $(CIMSERVER_PATH)cimserver -stop
   SLEEP =   SLEEP =
   REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus   REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus
   MUEXE = mu.exe   MUEXE = mu.exe
Line 32 
Line 32 
   STRIPCRS =   STRIPCRS =
   DIFF = diff   DIFF = diff
   REDIRECTERROR = 2>&1   REDIRECTERROR = 2>&1
   CIMSERVER_START_SERVICE = cimserver $(CIMSERVER_CONFIG_OPTIONS)    CIMSERVER_START_SERVICE =  $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
   CIMSERVER_STOP_SERVICE = cimserver -s    CIMSERVER_STOP_SERVICE =  $(CIMSERVER_PATH)cimserver -s
   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
Line 83 
Line 83 
   STRIPCRS =   STRIPCRS =
   DIFF = diff   DIFF = diff
   REDIRECTERROR = 2>&1   REDIRECTERROR = 2>&1
   CIMSERVER_START_SERVICE = cimserver $(CIMSERVER_CONFIG_OPTIONS)    CIMSERVER_START_SERVICE =  $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
   CIMSERVER_STOP_SERVICE = /usr/bin/ps -ef | /usr/bin/grep cimserver | /usr/bin/grep -v grep | /usr/bin/awk '{print "kill -9 "$$2 |"/usr/bin/ksh"}'   CIMSERVER_STOP_SERVICE = /usr/bin/ps -ef | /usr/bin/grep cimserver | /usr/bin/grep -v grep | /usr/bin/awk '{print "kill -9 "$$2 |"/usr/bin/ksh"}'
   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
Line 102 
Line 102 
   STRIPCRS =   STRIPCRS =
   DIFF = diff   DIFF = diff
   REDIRECTERROR = 2>&1   REDIRECTERROR = 2>&1
   CIMSERVER_START_SERVICE = cimserver $(CIMSERVER_CONFIG_OPTIONS)    CIMSERVER_START_SERVICE =  $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
   CIMSERVER_STOP_SERVICE = cimserver -s    CIMSERVER_STOP_SERVICE =  $(CIMSERVER_PATH)cimserver -s
   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
Line 148 
Line 148 
   STRIPCRS =   STRIPCRS =
   DIFF =   DIFF =
   REDIRECTERROR =   REDIRECTERROR =
   CIMSERVER_START_SERVICE = cimserver $(CIMSERVER_CONFIG_OPTIONS)    CIMSERVER_START_SERVICE =  $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
   CIMSERVER_STOP_SERVICE = cimserver -s    CIMSERVER_STOP_SERVICE =  $(CIMSERVER_PATH)cimserver -s
   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
Line 167 
Line 167 
   STRIPCRS =   STRIPCRS =
   DIFF =   DIFF =
   REDIRECTERROR =   REDIRECTERROR =
   CIMSERVER_START_SERVICE = cimserver $(CIMSERVER_CONFIG_OPTIONS)    CIMSERVER_START_SERVICE =  $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
   CIMSERVER_STOP_SERVICE = cimserver -s    CIMSERVER_STOP_SERVICE =  $(CIMSERVER_PATH)cimserver -s
   SLEEP = wait   SLEEP = wait
   REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus   REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus
   MUEXE = mu   MUEXE = mu
Line 185 
Line 185 
   STRIPCRS =   STRIPCRS =
   DIFF =   DIFF =
   REDIRECTERROR =   REDIRECTERROR =
   CIMSERVER_START_SERVICE = cimserver $(CIMSERVER_CONFIG_OPTIONS)    CIMSERVER_START_SERVICE =  $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
   CIMSERVER_STOP_SERVICE = cimserver -s    CIMSERVER_STOP_SERVICE =  $(CIMSERVER_PATH)cimserver -s
   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
Line 265 
Line 265 
         cimconfig -g traceLevel -c         cimconfig -g traceLevel -c
         cimconfig -g traceComponents -c         cimconfig -g traceComponents -c
         $(MAKE) -f $(ROOT)/mak/commands.mak cimstop         $(MAKE) -f $(ROOT)/mak/commands.mak cimstop
   
   # The runTestSuite option starts 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) $(MAKEOPTIONS) runTestSuite CIMSERVER_CONFIG_OPTIONS="$(runTestSuiteTest_CONFIG_OPTIONS)" TESTSUITE_CMDS="$(runTestSuiteTest_TEST_CMDS)"
   
   runTestSuite: CMDSFORCE
           $(CIMSERVER_START_SERVICE)
           $(foreach i, $(TESTSUITE_CMDS), $(subst @@, ,$(i));)
           $(CIMSERVER_STOP_SERVICE)

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