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

Diff for /pegasus/TestMakefile between version 1.24 and 1.33

version 1.24, 2005/02/15 17:52:55 version 1.33, 2005/05/12 23:18:04
Line 1 
Line 1 
   #//%2005////////////////////////////////////////////////////////////////////////
   #//
   #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
   #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
   #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
   #// IBM Corp.; EMC Corporation, The Open Group.
   #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
   #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; VERITAS Software Corporation; The Open Group.
   #//
   #// Permission is hereby granted, free of charge, to any person obtaining a copy
   #// of this software and associated documentation files (the "Software"), to
   #// deal in the Software without restriction, including without limitation the
   #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
   #// sell copies of the Software, and to permit persons to whom the Software is
   #// furnished to do so, subject to the following conditions:
   #//
   #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
   #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED
   #// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
   #// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
   #// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
   #// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
   #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   #//
   #//==============================================================================
 ############################################################################### ###############################################################################
 ## ##
 ## Test Makefile for Pegasus CIMOM ## Test Makefile for Pegasus CIMOM
Line 24 
Line 52 
  
 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 87 
         $(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 TestBinRepository
         $(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 124 
         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 Repository built using cimmofl
   ##
   ## TestBinRepositoryServer rule is used to run the poststarttests suite on
   ## the Binary Repository built using cimmof
   ##
   ## TestBinCmpRepository rule is used to run the poststarttest suite on
   ## the Binry Compressed Repository built using cimmofl
   ##
   
   ############################
   ##
   ## TestBinRepository
   ##
   ### bug 3011 disabled Binary Repository testing on LINUX_IA64 to allow
   ### the nightly tests to run
   
   ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU)
   TestBinRepository:
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
           @ $(ECHO) TestBinRepository +++++ NOT RUN on this platform - bug 3011
   else
   TestBinRepository: TestBinClean TestBinBuildRepo  TestBinRepo
           @ $(ECHO) TestBinRepository +++++ passed all test
   endif
   
   ############################
   ##
   ## TestBinRepositoryServer
   ##
   TestBinRepositoryServer: TestBinClean  TestBinBuildRepoServ TestBinRepo
           @ $(ECHO) TestBinRepositoryServer +++++ passed all test
   
   ############################
   ##
   ## TestBinCmpRepository -  run poststarttest on Compressed BIN Repository
   ##
   ifdef PEGASUS_ENABLE_COMPRESSED_REPOSITORY
   TestBinCmpRepository:
           @ $(ECHO) TestBinCmpRepository +++++ Repository compressed by default - nothing more to test.
           @ $(ECHO) TestBinCmpRepository +++++ passed all test
   else
   
   ifdef PEGASUS_ENABLE_COMPRESSED_REPOSITORY_TEST
   
   TestBinCmpRepository: TestBinClean  TestBinCmpBuild TestBinBuildRepo TestBinRepo TestBinRegBuild
           @ $(ECHO) TestBinCmpRepository +++++ passed all test
   else
   TestBinCmpRepository:
           @ $(ECHO) TestBinCmpRepository +++++ Not tested
           @ $(ECHO) TestBinCmpRepository +++++ refer to readme.compressed_repository
           @ $(ECHO) TestBinCmpRepository +++++ to enable: set PEGASUS_ENABLE_COMPRESSED_REPOSITORY_TEST=true
   endif
   endif
   
   
   ############################
   ##
   ## TestBinCmpBuild - used to compile the repository for compression
   ##
   TestBinCmpBuild:
           @ $(MAKE) "-SC" $(ROOT)/src/Pegasus/Repository clean
           @ $(MAKE) "-SC" $(ROOT)/src/Pegasus/Repository depend PEGASUS_ENABLE_COMPRESSED_REPOSITORY=1
           @ $(MAKE) "-SC" $(ROOT)/src/Pegasus/Repository PEGASUS_ENABLE_COMPRESSED_REPOSITORY=1
   
   
   ############################
   ##
   ## TestBinRegBuild - used to compile the repository for no compression
   ##
   TestBinRegBuild:
           @ $(MAKE) "-SC" $(ROOT)/src/Pegasus/Repository clean
           @ $(MAKE) "-SC" $(ROOT)/src/Pegasus/Repository depend
           @ $(MAKE) "-SC" $(ROOT)/src/Pegasus/Repository
   
   
   ###########################
   ##
   ## 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 444 
 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.33
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2