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

Diff for /pegasus/TestMakefile between version 1.21 and 1.30

version 1.21, 2005/02/11 01:44:45 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  
 include $(PEGASUS_ROOT)/mak/commands.mak  
   
 system = localhost  
   
 ############################################################################### ###############################################################################
 ## ##
 ## Test Makefile for Pegasus CIMOM ## Test Makefile for Pegasus CIMOM
Line 19 
Line 13 
 ## ##
 ############################################################################### ###############################################################################
  
 TESTS = prestarttests poststarttests  
   
 error: error:
         @ $(ECHO) "Specify desired makefile option (i.e., build, rebuild)"         @ $(ECHO) "Specify desired makefile option (i.e., build, rebuild)"
  
 rebuild: clean buildmu all  include $(PEGASUS_ROOT)/mak/config.mak
   include $(PEGASUS_ROOT)/mak/test.mak
   include $(PEGASUS_ROOT)/mak/commands.mak
   
   system = localhost
   
   TESTS = prestarttests poststarttests
   
   rebuild: clean all tests
  
 build: all  build: all tests
  
 clean: clean:
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile clean         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile clean
Line 44 
Line 44 
         $(MAKE) --directory=$(PEGASUS_ROOT)/doc/DevManual -f Makefile         $(MAKE) --directory=$(PEGASUS_ROOT)/doc/DevManual -f Makefile
  
 repositoryServer: repositoryServer:
         $(CIMSERVER_STOP_SERVICE)          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(SLEEP) 5         $(SLEEP) 5
         $(RMDIRHIER) $(REPOSITORY_ROOT)         $(RMDIRHIER) $(REPOSITORY_ROOT)
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
Line 53 
Line 53 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepositoryServer         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepositoryServer
  
 prestarttests: prestarttests:
         $(CIMSERVER_STOP_SERVICE)          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(SLEEP) 5         $(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
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run         $(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/CQL/tests/Queries -f Makefile clean
Line 67 
Line 68 
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(SLEEP) 5         $(SLEEP) 5
         $(MAKE) --directory=$(PEGASUS_ROOT) -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_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
Line 91 
Line 94 
         TestClient         TestClient
  
 run_OOP_TS1: run_OOP_TS1:
         $(MAKE) -f $(PEGASUS_ROOT)/mak/commands.mak runTestSuite \          $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(OOP_TS1_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(OOP_TS1_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(OOP_TS1_TEST_CMDS)"             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
   
   
   
   
   ###############################################################################
 ## ##
 ## Trace Configuration ## Trace Configuration
 ## ##
Line 159 
Line 264 
  
 TestNoSecurity: TestNoSecurity:
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile tests         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile tests
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithoutSSL
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile RunTestClientLocal         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile RunTestClientLocal
  
 TestLocalSecurity: TestLocalSecurity:
Line 244 
Line 350 
 startcimWithSSL: startcimWithSSL:
         $(CIMSERVER_START_SERVICE) enableHttpConnection=false enableHttpsConnection=true         $(CIMSERVER_START_SERVICE) enableHttpConnection=false enableHttpsConnection=true
         $(SLEEP) 5         $(SLEEP) 5
   
 pegasus:  
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile rebuild  

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