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

Diff for /pegasus/TestMakefile between version 1.4 and 1.15

version 1.4, 2002/09/17 05:51:47 version 1.15, 2004/11/15 21:51:08
Line 27 
Line 27 
 ############################################################################### ###############################################################################
  
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC) ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
   CIMSERVER_START_SERVICE = start cimserver      CIMSERVER_START_SERVICE = cimserver -start
   CIMSERVER_STOP_SERVICE =      CIMSERVER_STOP_SERVICE = cimserver -stop
   SLEEP =   SLEEP =
   REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus   REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus
   MUEXE = mu.exe   MUEXE = mu.exe
   COPYMU = copy src\utils\mu\$(MUEXE) /y $(MUEXE)      MKDIR = $(MUEXE) mkdirhier
   MKDIR = src/utils/mu/mu mkdirhier      TESTS = prestarttests poststarttests
   TESTS = prestarttests  
 endif endif
  
 ifeq ($(OS),HPUX)  ifeq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)
   CIMSERVER_START_SERVICE = cimserver   CIMSERVER_START_SERVICE = cimserver
   CIMSERVER_STOP_SERVICE = cimserver -s      CIMSERVER_STOP_SERVICE = cimserver -s; true
   SLEEP = sleep 5   SLEEP = sleep 5
   MUEXE = mu   MUEXE = mu
   COPYMU = cp -f src/utils/mu/$(MUEXE) $(BIN_DIR)/$(MUEXE)      MKDIR = $(MUEXE) mkdirhier
   MKDIR = src/utils/mu/mu mkdirhier  
   TESTS = prestarttests poststarttests   TESTS = prestarttests poststarttests
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU)  ifeq ($(OS),HPUX)
   CIMSERVER_START_SERVICE = cimserver   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"}'      CIMSERVER_STOP_SERVICE = cimserver -s; true
   SLEEP = sleep 5   SLEEP = sleep 5
   MUEXE = mu   MUEXE = mu
   COPYMU = cp -f src/utils/mu/$(MUEXE) $(BIN_DIR)/$(MUEXE)      MKDIR = $(MUEXE) mkdirhier
   MKDIR = src/utils/mu/mu mkdirhier  
   TESTS = prestarttests poststarttests   TESTS = prestarttests poststarttests
 endif endif
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU)  ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
   CIMSERVER_START_SERVICE = cimserver   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"}'      CIMSERVER_STOP_SERVICE = cimserver -s; true
   SLEEP = sleep 5   SLEEP = sleep 5
   MUEXE = mu   MUEXE = mu
   COPYMU = cp -f src/utils/mu/$(MUEXE) $(BIN_DIR)/$(MUEXE)      MKDIR = $(MUEXE) mkdirhier
   MKDIR = src/utils/mu/mu mkdirhier  
   TESTS = prestarttests poststarttests   TESTS = prestarttests poststarttests
 endif endif
  
 error: error:
         @ echo "Specify desired makefile option (i.e., build, rebuild)"          @ $(ECHO) "Specify desired makefile option (i.e., build, rebuild)"
  
 buildmu: buildmu:
         $(MAKE) --directory=src/utils/mu -f Makefile          $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile
         $(MKDIR) $(BIN_DIR)         $(MKDIR) $(BIN_DIR)
         $(COPYMU)  
  
 rebuild: clean buildmu all rebuild: clean buildmu all
  
Line 84 
Line 79 
         $(MAKE)  -f Makefile all         $(MAKE)  -f Makefile all
  
 doc: doc:
         $(MAKE) --directory=doc/ProviderSpec -f Makefile          $(MAKE) --directory=$(PEGASUS_ROOT)/doc/ProviderSpec -f Makefile
         $(MAKE) --directory=doc/DevManual -f Makefile          $(MAKE) --directory=$(PEGASUS_ROOT)/doc/DevManual -f Makefile
  
 clean: clean:
         $(MAKE) -f Makefile clean         $(MAKE) -f Makefile clean
Line 105 
Line 100 
         $(MAKE) -f Makefile repository         $(MAKE) -f Makefile repository
         $(MAKE) -f Makefile testrepository         $(MAKE) -f Makefile testrepository
         $(MAKE) -f Makefile tests         $(MAKE) -f Makefile tests
         $(MAKE) --directory=src/Server -f Makefile install          $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run
  
 poststarttests: poststarttests:
         $(MAKE) --directory=test/wetest -f Makefile clean          $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile clean
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(SLEEP)         $(SLEEP)
         $(MAKE) -f Makefile poststarttests         $(MAKE) -f Makefile poststarttests
  
 tests: $(TESTS) tests: $(TESTS)
         @ echo Finished Tests  ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
           $(CIMSERVER_STOP_SERVICE)
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile uninstall
   endif
           @ $(ECHO) Finished Tests
  
 ############################################################################### ###############################################################################
 ## ##
Line 223 
Line 222 
  
 EnableAuthorization: EnableAuthorization:
         $(MAKE) -f TestMakefile -i stopcim         $(MAKE) -f TestMakefile -i stopcim
         cimconfig -s enableAuthorization=true -p          cimconfig -s enableNamespaceAuthorization=true -p
         $(MAKE) -f TestMakefile startcimWithoutSSL         $(MAKE) -f TestMakefile startcimWithoutSSL
         $(MAKE) -f TestMakefile -i ConfigureAuthorizations         $(MAKE) -f TestMakefile -i ConfigureAuthorizations
  
Line 239 
Line 238 
 ConfigureAuthorizations: ConfigureAuthorizations:
         cimauth -a -u guest -n test/cimv2 -R -W         cimauth -a -u guest -n test/cimv2 -R -W
         cimauth -a -u guest -n root/cimv2 -R -W         cimauth -a -u guest -n root/cimv2 -R -W
           cimauth -a -u guest -n root/PG_Internal -R -W
           cimauth -a -u guest -n root/PG_InterOp -R -W
           cimauth -a -u guest -n root/benchmark -R -W
           cimauth -a -u guest -n root/sampleprovider -R -W
         cimauth -a -u guest -n test/static -R -W         cimauth -a -u guest -n test/static -R -W
         cimauth -a -u guest -n root/SampleProvider -R -W         cimauth -a -u guest -n root/SampleProvider -R -W
         cimauth -a -u guest -n root -R -W         cimauth -a -u guest -n root -R -W
Line 255 
Line 258 
         cimauth -a -u guest -n test1/test2/test3/test4/test5/test6 -R -W         cimauth -a -u guest -n test1/test2/test3/test4/test5/test6 -R -W
  
 startcimWithoutSSL: startcimWithoutSSL:
         cimserver          $(CIMSERVER_START_SERVICE)
         sleep 10          $(SLEEP)
  
 startcimWithSSL: startcimWithSSL:
         cimserver SSL=true          $(CIMSERVER_START_SERVICE) enableHttpConnection=false enableHttpsConnection=true
         sleep 10          $(SLEEP)
  
 stopcim: stopcim:
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
         sleep 5          $(SLEEP)
  
 rebuild: rebuild:
         $(MAKE) -f TestMakefile -i stopcim         $(MAKE) -f TestMakefile -i stopcim
Line 273 
Line 276 
  
 pegasus: pegasus:
         $(MAKE) -f Makefile rebuild         $(MAKE) -f Makefile rebuild
   

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