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

Diff for /pegasus/mak/BuildMakefile between version 1.33 and 1.34

version 1.33, 2005/02/10 06:41:52 version 1.34, 2005/02/11 00:22:16
Line 22 
Line 22 
 ############################################################################### ###############################################################################
  
 include $(PEGASUS_ROOT)/mak/config.mak include $(PEGASUS_ROOT)/mak/config.mak
   include $(PEGASUS_ROOT)/mak/commands.mak
  
 # There is a start command for cimserver but no stop today.  Because of problems with  
 # the use of cimserver as a service, we simply used the start command to allow us to  
 # get on with testing. I know of no CLI to stop a window started with start so that  
 # field is blank.  ks 7 April 2002  
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)  
   CIMSERVER_START_SERVICE = cimserver -start  
   CIMSERVER_STOP_SERVICE = cimserver -stop  
   SLEEP =  
   REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus  
   MUEXE = mu.exe  
   MKDIR = $(MUEXE) mkdirhier  
   TESTS = prestarttests poststarttests  
 endif  
   
 ifeq ($(OS),HPUX)  
   CIMSERVER_START_SERVICE = cimserver  
   CIMSERVER_STOP_SERVICE = cimserver -s; true  
   SLEEP = sleep 5  
   REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old  
   MUEXE = mu  
   MKDIR = $(MUEXE) mkdirhier  
   TESTS = prestarttests poststarttests  
 endif  
   
 ifeq ($(PEGASUS_PLATFORM),SOLARIS_SPARC_CC)  
   CIMSERVER_START_SERVICE = cimserver  
   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 5  
   REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old  
   MUEXE = mu  
   MKDIR = $(MUEXE) mkdirhier  
   TESTS = prestarttests poststarttests  
 endif  
   
 ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU  
   CIMSERVER_START_SERVICE = cimserver  
   CIMSERVER_STOP_SERVICE = /bin/ps -ef | /bin/grep cimserver | /bin/grep -v grep | /usr/bin/awk '{print "kill -9 "$$2 |"/bin/bash"}'  
   SLEEP = sleep 5  
   REMOVE_PEGASUS_DIRECTORY = rm -Rf pegasus.old; mv pegasus pegasus.old  
   MUEXE = mu  
   MKDIR = $(MUEXE) mkdirhier  
   TESTS = prestarttests poststarttests   TESTS = prestarttests poststarttests
 endif  
  
 ifeq ($(DYNAMIC_SOCKSIFY),TRUE) ifeq ($(DYNAMIC_SOCKSIFY),TRUE)
   CVS = socksify cvs   CVS = socksify cvs
Line 78 
Line 37 
  
 buildmu: buildmu:
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile
         $(MKDIR) $(BIN_DIR)          $(MKDIRHIER) $(BIN_DIR)
  
 cleanbuild: removeall recheckout buildmu all $(TESTS) cleanbuild: removeall recheckout buildmu all $(TESTS)
  
Line 111 
Line 70 
  
 repositoryServer: repositoryServer:
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
         $(SLEEP)          $(SLEEP) 5
         $(RMDIRHIER) $(REPOSITORY_ROOT)         $(RMDIRHIER) $(REPOSITORY_ROOT)
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(SLEEP)          $(SLEEP) 5
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryServer         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryServer
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepositoryServer         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepositoryServer
  
 prestarttests: prestarttests:
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
         $(SLEEP)          $(SLEEP) 5
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile tests         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile tests
Line 131 
Line 90 
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Query/QueryExpression/tests/Queries -f Makefile clean         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Query/QueryExpression/tests/Queries -f Makefile clean
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile clean         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile clean
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(SLEEP)          $(SLEEP) 5
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests
  
 ############################################################################### ###############################################################################
 ##  Test Suite Definitions  
 ###############################################################################  
   
 ###############################################################################  
 ##  OOP Test Suite 1: "Out-of-Process"(OOP) Provider Tests  
 ##  
 ##  Configuration Options: forceProviderProcesses=true  
 ##  
 ###############################################################################  
 OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true  
 OOP_TS1_TEST_CMDS = \  
         TestClient  
   
 run_OOP_TS1:  
         $(MAKE) -f $(PEGASUS_ROOT)/mak/commands.mak runTestSuite \  
             CIMSERVER_CONFIG_OPTIONS="$(OOP_TS1_CONFIG_OPTIONS)" \  
             TESTSUITE_CMDS="$(OOP_TS1_TEST_CMDS)"  
 ###############################################################################  
  
 tests: $(TESTS) tests: $(TESTS)
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC) ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)

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