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

Diff for /pegasus/TestMakefile between version 1.7 and 1.30

version 1.7, 2003/06/14 19:25:37 version 1.30, 2005/05/10 02:55:54
Line 1 
Line 1 
 include $(PEGASUS_ROOT)/mak/config.mak  
 include $(PEGASUS_ROOT)/mak/test.mak  
   
 system = localhost  
   
 ############################################################################### ###############################################################################
 ## ##
 ## Test Makefile for Pegasus CIMOM ## Test Makefile for Pegasus CIMOM
Line 18 
Line 13 
 ## ##
 ############################################################################### ###############################################################################
  
 ###############################################################################  error:
 ##          @ $(ECHO) "Specify desired makefile option (i.e., build, rebuild)"
 ## Platform specific settings for several platforms.  
 ##  
 ## NOTE: Please add platform specific environment variables as appropriate.  
 ##  
 ###############################################################################  
  
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)  include $(PEGASUS_ROOT)/mak/config.mak
   CIMSERVER_START_SERVICE = cimserver -start  include $(PEGASUS_ROOT)/mak/test.mak
   CIMSERVER_STOP_SERVICE = cimserver -stop  include $(PEGASUS_ROOT)/mak/commands.mak
   SLEEP =  
   REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus  
   MUEXE = mu.exe  
   COPYMU = copy src\utils\mu\$(MUEXE) /y $(MUEXE)  
   MKDIR = src/utils/mu/mu mkdirhier  
   TESTS = prestarttests poststarttests  
 endif  
  
 ifeq ($(OS),HPUX)  system = localhost
   CIMSERVER_START_SERVICE = cimserver  
   CIMSERVER_STOP_SERVICE = cimserver -s  
   SLEEP = sleep 5  
   MUEXE = mu  
   COPYMU = cp -f src/utils/mu/$(MUEXE) $(BIN_DIR)/$(MUEXE)  
   MKDIR = src/utils/mu/mu mkdirhier  
   TESTS = prestarttests poststarttests  
 endif  
  
 ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU  
   CIMSERVER_START_SERVICE = cimserver  
   CIMSERVER_STOP_SERVICE = ps -ef | grep cimserver | grep -v grep | awk '{print "kill -9 "$$2 |"/bin/bash"}'  
   SLEEP = sleep 5  
   MUEXE = mu  
   COPYMU = cp -f src/utils/mu/$(MUEXE) $(BIN_DIR)/$(MUEXE)  
   MKDIR = src/utils/mu/mu mkdirhier  
   TESTS = prestarttests poststarttests   TESTS = prestarttests poststarttests
 endif  
  
 error:  rebuild: clean all tests
         @ echo "Specify desired makefile option (i.e., build, rebuild)"  
  
 buildmu:  build: all tests
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile  
         $(MKDIR) $(BIN_DIR)  
         $(COPYMU)  
  
 rebuild: clean buildmu all  clean:
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile clean
  
 build: all  buildmu:
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile
           $(MKDIRHIER) $(BIN_DIR)
  
 all: buildmu all: buildmu
         $(MAKE)  -f Makefile depend          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile depend
         $(MAKE)  -f Makefile all          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile all
  
 doc: doc:
         $(MAKE) --directory=$(PEGASUS_ROOT)/doc/ProviderSpec -f Makefile         $(MAKE) --directory=$(PEGASUS_ROOT)/doc/ProviderSpec -f Makefile
         $(MAKE) --directory=$(PEGASUS_ROOT)/doc/DevManual -f Makefile         $(MAKE) --directory=$(PEGASUS_ROOT)/doc/DevManual -f Makefile
  
 clean:  
         $(MAKE) -f Makefile clean  
   
 repositoryServer: repositoryServer:
         $(CIMSERVER_STOP_SERVICE)          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(SLEEP)          $(SLEEP) 5
         $(RMDIRHIER) $(REPOSITORY_ROOT)         $(RMDIRHIER) $(REPOSITORY_ROOT)
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(SLEEP)          $(SLEEP) 5
         $(MAKE) -f Makefile repositoryServer          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryServer
         $(MAKE) -f Makefile testrepositoryServer          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepositoryServer
  
 prestarttests: prestarttests:
         $(CIMSERVER_STOP_SERVICE)          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(SLEEP)          $(SLEEP) 5
         $(MAKE) -f Makefile repository          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository
         $(MAKE) -f Makefile testrepository          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository
         $(MAKE) -f Makefile tests          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile tests
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install          $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Clients/ssltrustmgr/tests -f Makefile test_setup
  
 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) 5
         $(MAKE) -f Makefile poststarttests          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOP_TS1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_IndInit_TS1
  
 tests: $(TESTS) tests: $(TESTS)
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC) ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
         $(CIMSERVER_STOP_SERVICE)          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(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)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(OOP_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(OOP_TS1_TEST_CMDS)"
   ###############################################################################
   
   ###############################################################################
   ##  IndInit Test Suite 1: IndicationService Initialization Tests
   ##
   ##  Configuration Options: (none)
   ##
   ###############################################################################
   IndInit_TS1_CONFIG_OPTIONS =
   IndInit_TS1a_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Pegasus/IndicationService/tests/ProcessIndication@@IndInit_TS1a
   IndInit_TS1b_TEST_CMDS = \
           $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Pegasus/IndicationService/tests/ProcessIndication@@IndInit_TS1b
   
   run_IndInit_TS1:
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(IndInit_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(IndInit_TS1a_TEST_CMDS)"
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(IndInit_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(IndInit_TS1b_TEST_CMDS)"
   
   ###############################################################################
   ##  SSL Test Suite 1: SSL Tests
   ##
   ##  Configuration Options: enableAuthentication=true
   ##                         enableHttpsConnection=true
   ##                         sslClientVerificationMode=optional
   ##                         sslTrustStoreUserName=$(CURRENT_USER)
   ##
   ###############################################################################
   SSL_TS1_CONFIG_OPTIONS = enableHttpsConnection=true enableAuthentication=true \
          sslClientVerificationMode=optional sslTrustStoreUserName=$(CURRENT_USER)
   SSL_TS1_TEST_CMDS = \
          $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/ssltrustmgr/tests@@SSLCertificateTest1
   
   run_SSL_TS1:
           $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
               CIMSERVER_CONFIG_OPTIONS="$(SSL_TS1_CONFIG_OPTIONS)" \
               TESTSUITE_CMDS="$(SSL_TS1_TEST_CMDS)"
   ###############################################################################
   
   ##############################################################################
   ##
   ## TestBinReposiory rule is used to run the poststarttests suite on
   ## the Binary Reposiory.
   ##
   ## Running the poststarttests as part of the nightly's I have three choices.
   ## 1. a)remove repository,
   ##    b)build bin repository as repository,
   ##    c)run test,
   ##    d)remove repository,
   ##    e)build xml repository.
   ##
   ## 2. a)build bin repository as repository_bin,
   ##    b)run test on repository_bin
   ##
   ## Currently scenaerio 1 works but it is slow.
   ## Scenaerio 2 is close to working. There may be a few test remaining that
   ## don't honor the REPOSITORY_NAME build config variable.
   ##
   
   
   
   TestBinRepository: TestBinRepository2
           $(ECHO) TestBinRepository +++++ passed all test
   ##
   ## 1. a)remove repository,
   ##    b)build bin repository as repository,
   ##    c)run test,
   ##    d)remove repository,
   ##    e)build xml repository.
   ##
   TestBinRepository1:
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryclean
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository REPOSITORY_MODE=BIN
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository REPOSITORY_MODE=BIN
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="enableBinaryRepository=true"
           $(SLEEP) 5
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests REPOSITORY_MODE=BIN
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryclean
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository
   ##
   ## 2. a)build bin repository as repository_bin,
   ##    b)run test on repository_bin
   ##
   TestBinRepository2:
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryclean REPOSITORY_NAME=repository_bin
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository REPOSITORY_NAME=repository_bin REPOSITORY_MODE=BIN
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository REPOSITORY_NAME=repository_bin REPOSITORY_MODE=BIN
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="enableBinaryRepository=true repositoryDir=$(PEGASUS_HOME)/repository_bin"
           $(SLEEP) 5
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests REPOSITORY_NAME=repository_bin REPOSITORY_MODE=BIN
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
   
   
   
  
 ############################################################################### ###############################################################################
 ## ##
Line 159 
Line 250 
         cimconfig -g traceLevel         cimconfig -g traceLevel
         cimconfig -g traceFilePath         cimconfig -g traceFilePath
  
 # DO NOT DELETE  # More options...
  
 standardtests: standardtests:
         $(MAKE) -f TestMakefile -i DisableSecurity          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i DisableSecurity
         $(MAKE) -f TestMakefile TestCimmof          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestCimmof
         $(MAKE) -f TestMakefile TestNoSecurity          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestNoSecurity
         $(MAKE) -f TestMakefile EnableAuthentication          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthentication
         $(MAKE) -f TestMakefile TestLocalSecurity          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestLocalSecurity
         $(MAKE) -f TestMakefile TestRemoteSecurity          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestRemoteSecurity
         $(MAKE) -f TestMakefile EnableAuthorization          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthorization
         $(MAKE) -f TestMakefile TestAuthorization          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestAuthorization
  
 TestNoSecurity: TestNoSecurity:
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile tests         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile tests
         $(MAKE) -f TestMakefile RunTestClientLocal          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithoutSSL
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile RunTestClientLocal
  
 TestLocalSecurity: TestLocalSecurity:
         $(MAKE) -f TestMakefile RunTestClientLocal          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile RunTestClientLocal
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile poststarttests HOSTNAME= PORT= USER= PASSWORD= SECURITY_ENABLED=true         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile poststarttests HOSTNAME= PORT= USER= PASSWORD= SECURITY_ENABLED=true
  
 TestRemoteSecurity: TestRemoteSecurity:
Line 185 
Line 277 
  
 TestAuthorization: TestAuthorization:
         DeleteNamespace -a -user guest -password guest         DeleteNamespace -a -user guest -password guest
         $(MAKE) -f TestMakefile RunTestClientLocal          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile RunTestClientLocal
         TestClient -user guest -password guest $(system):5988         TestClient -user guest -password guest $(system):5988
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest/static -f Makefile poststarttests HOSTNAME=-h$(system) USER=-uguest PASSWORD=-wguest SECURITY_ENABLED=true         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest/static -f Makefile poststarttests HOSTNAME=-h$(system) USER=-uguest PASSWORD=-wguest SECURITY_ENABLED=true
  
 TestSubscriptions: TestSubscriptions:
         $(MAKE) -f TestMakefile DisableSecurity          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile DisableSecurity
         $(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) -f TestMakefile startcimWithoutSSL          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithoutSSL
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest/cimv2/Subscription -f Makefile poststarttests         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest/cimv2/Subscription -f Makefile poststarttests
         $(MAKE) -f TestMakefile stopcim          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstop
  
 TestCimmof: TestCimmof:
         $(MAKE) -f Testcimmof poststarttests          $(MAKE) --directory=$(PEGASUS_ROOT) -f Testcimmof poststarttests
   
  
 RunTestClientLocal: RunTestClientLocal:
         TestClient -local         TestClient -local
  
 DisableSecurity: DisableSecurity:
         $(MAKE) -f TestMakefile -i stopcim          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         cimconfig -s enableAuthentication=false -p         cimconfig -s enableAuthentication=false -p
         cimconfig -s enableNamespaceAuthorization=false -p         cimconfig -s enableNamespaceAuthorization=false -p
  
 EnableAuthentication: EnableAuthentication:
         $(MAKE) -f TestMakefile -i stopcim          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         cimconfig -s enableAuthentication=true -p         cimconfig -s enableAuthentication=true -p
         $(MAKE) -f TestMakefile startcimWithoutSSL          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithoutSSL
         $(MAKE) -f TestMakefile ConfigureUsers          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile ConfigureUsers
  
 EnableAuthorization: EnableAuthorization:
         $(MAKE) -f TestMakefile -i stopcim          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         cimconfig -s enableAuthorization=true -p          cimconfig -s enableNamespaceAuthorization=true -p
         $(MAKE) -f TestMakefile startcimWithoutSSL          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithoutSSL
         $(MAKE) -f TestMakefile -i ConfigureAuthorizations          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i ConfigureAuthorizations
  
 EnableSSL: EnableSSL:
         $(MAKE) -f TestMakefile -i stopcim          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(MAKE) -f TestMakefile startcimWithSSL          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithSSL
  
 ConfigureUsers: ConfigureUsers:
 ifndef PEGASUS_PAM_AUTHENTICATION ifndef PEGASUS_PAM_AUTHENTICATION
Line 233 
Line 324 
 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 344 
         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) 5
  
 startcimWithSSL: startcimWithSSL:
         cimserver SSL=true          $(CIMSERVER_START_SERVICE) enableHttpConnection=false enableHttpsConnection=true
         sleep 10          $(SLEEP) 5
   
 stopcim:  
         $(CIMSERVER_STOP_SERVICE)  
         sleep 5  
   
 rebuild:  
         $(MAKE) -f TestMakefile -i stopcim  
         rm -f rebuild.txt  
         $(MAKE) -f TestMakefile pegasus >> rebuild.txt  2>&1  
   
 pegasus:  
         $(MAKE) -f Makefile rebuild  
   


Legend:
Removed from v.1.7  
changed lines
  Added in v.1.30

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2