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

Diff for /pegasus/TestMakefile between version 1.7 and 1.18

version 1.7, 2003/06/14 19:25:37 version 1.18, 2005/02/10 06:41:52
Line 29 
Line 29 
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC) ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
   CIMSERVER_START_SERVICE = cimserver -start   CIMSERVER_START_SERVICE = cimserver -start
   CIMSERVER_STOP_SERVICE = cimserver -stop   CIMSERVER_STOP_SERVICE = cimserver -stop
   SLEEP =      SLEEP = mu sleep 5
   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
   endif
   
   ifeq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)
       CIMSERVER_START_SERVICE = cimserver
       CIMSERVER_STOP_SERVICE = cimserver -s; true
       SLEEP = sleep 5
       MUEXE = mu
       MKDIR = $(MUEXE) mkdirhier
   TESTS = prestarttests poststarttests   TESTS = prestarttests poststarttests
 endif endif
  
 ifeq ($(OS),HPUX) ifeq ($(OS),HPUX)
   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
  
 ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
   CIMSERVER_START_SERVICE = cimserver   CIMSERVER_START_SERVICE = cimserver
   CIMSERVER_STOP_SERVICE = ps -ef | grep cimserver | grep -v grep | 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=$(PEGASUS_ROOT)/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 95 
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=$(PEGASUS_ROOT)/src/Server -f Makefile install          $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run
  
 poststarttests: poststarttests:
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/CQL/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)
Line 108 
Line 115 
         $(CIMSERVER_STOP_SERVICE)         $(CIMSERVER_STOP_SERVICE)
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile uninstall         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile uninstall
 endif endif
         @ echo Finished Tests          @ $(ECHO) Finished Tests
   
   ###############################################################################
   ##  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)"
   ###############################################################################
  
 ############################################################################### ###############################################################################
 ## ##
Line 200 
Line 227 
 TestCimmof: TestCimmof:
         $(MAKE) -f Testcimmof poststarttests         $(MAKE) -f Testcimmof poststarttests
  
   
 RunTestClientLocal: RunTestClientLocal:
         TestClient -local         TestClient -local
  
Line 217 
Line 243 
  
 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 233 
Line 259 
 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 249 
Line 279 
         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 267 
Line 297 
  
 pegasus: pegasus:
         $(MAKE) -f Makefile rebuild         $(MAKE) -f Makefile rebuild
   

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