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

Diff for /pegasus/TestMakefile between version 1.24 and 1.31

version 1.24, 2005/02/15 17:52:55 version 1.31, 2005/05/10 23:28:03
Line 24 
Line 24 
  
 TESTS = prestarttests poststarttests TESTS = prestarttests poststarttests
  
 rebuild: clean all  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 59 
Line 59 
         $(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:  poststarttestsclean:
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/CQL/tests/Queries -f Makefile clean         $(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)/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
   
   poststarttests: poststarttestsclean
         $(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)
Line 91 
Line 96 
         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)"
   ###############################################################################
   
   ##############################################################################
   ##
   ## TestBinRepository rule is used to run the poststarttests suite on
   ## the Binary Reposiory built using cimmofl
   ##
   ## TestBinRepositoryServer rule is used to run the poststarttests suite on
   ## the Binary Reposiory built using cimmof
   ##
   
   ############################
   ##
   ## TestBinRepository
   ##
   TestBinRepository: TestBinClean TestBinBuildRepo  TestBinRepo
           $(ECHO) TestBinRepository +++++ passed all test
   
   ############################
   ##
   ## TestBinRepositoryServer
   ##
   TestBinRepositoryServer: TestBinClean  TestBinBuildRepoServ TestBinRepo
           $(ECHO) TestBinRepositoryServer +++++ passed all test
   
   ###########################
   ##
   ## TestBinClean
   ##
   TestBinClean:
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryclean REPOSITORY_NAME=repository_bin
   
   
   ###########################
   ##
   ## TestBinStartServer
   ##
   TestBinStartServer:
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run
           - $(MKDIRHIER) $(PEGASUS_HOME)/repository_bin
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="enableBinaryRepository=true repositoryDir=$(PEGASUS_HOME)/repository_bin"
           $(SLEEP) 5
   
   ###########################
   ##
   ## TestBinBuildRepo
   ##
   TestBinBuildRepo:
           $(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
   
   
   ###########################
   ##
   ## TestBinBuildRepoServ
   ##
   TestBinBuildRepoServ: TestBinStartServer
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryServer REPOSITORY_NAME=repository_bin REPOSITORY_MODE=BIN
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepositoryServer REPOSITORY_NAME=repository_bin REPOSITORY_MODE=BIN
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
   
   
   ###########################
   ##
   ## TestBinRepo
   ##
   TestBinRepo: poststarttestsclean TestBinStartServer
           $(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 245 
Line 361 
 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.24  
changed lines
  Added in v.1.31

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2