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

Diff for /pegasus/TestMakefile between version 1.33 and 1.39

version 1.33, 2005/05/12 23:18:04 version 1.39, 2005/10/10 00:39:04
Line 39 
Line 39 
 ##      standardtests      - Execute poststartests and a series of ##      standardtests      - Execute poststartests and a series of
 ##                           posstarttests using multiple options. ##                           posstarttests using multiple options.
 ## ##
   #####################
   ##
   ## The following are all standalone tests. That is the can be invoked
   ## without any prerequisite dependencies. They stop and start the server as
   ## needed. They clean and rebuild the repository as needed and then run the
   ## poststarttests.
   ##
   ##      TestXMLRepository  - Executes poststartests on binary repository
   ##                              built with cimmofl.
   ##
   ##      TestXMLRepositoryServer - Executes poststartests on binary repository
   ##                              built with cimmof.
   ##
   ##      TestXMLCmpRepository - Executes poststartests on binary compressed
   ##                              repository built with cimmofl.
   ##
   ##
   ##      TestBinRepository  - Executes poststartests on binary repository
   ##                              built with cimmofl.
   ##
   ##      TestBinRepositoryServer - Executes poststartests on binary repository
   ##                              built with cimmof.
   ##
   ##      TestBinCmpRepository - Executes poststartests on binary compressed
   ##                              repository built with cimmofl.
   ##
   ##
 ############################################################################### ###############################################################################
  
 error: error:
Line 52 
Line 79 
  
 TESTS = prestarttests poststarttests TESTS = prestarttests poststarttests
  
 rebuild: clean all tests  .PHONY: FORCE
  
 build: all tests  FORCE:
  
 clean:  rebuild: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile clean          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile rebuild
  
 buildmu:  build: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile build
         $(MKDIRHIER) $(BIN_DIR)  
   clean: FORCE
 all: buildmu          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile clean
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile depend  
         $(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
Line 86 
Line 111 
         $(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/Clients/ssltrustmgr/tests -f Makefile test_setup  
  
 poststarttestsclean: 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
Line 95 
Line 118 
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile clean         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile clean
  
 poststarttests: poststarttestsclean poststarttests: poststarttestsclean
           -$(CIMSERVER_STOP_SERVICE)
         $(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 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         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_IndInit_TS1
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_SSL_TS1
  
 tests: $(TESTS) tests: $(TESTS)
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC) ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
Line 163 
Line 188 
 SSL_TS1_TEST_CMDS = \ SSL_TS1_TEST_CMDS = \
        $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/ssltrustmgr/tests@@SSLCertificateTest1        $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/ssltrustmgr/tests@@SSLCertificateTest1
  
 run_SSL_TS1:  ifdef PEGASUS_HAS_SSL
   run_SSL_TS1: FORCE
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(SSL_TS1_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(SSL_TS1_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(SSL_TS1_TEST_CMDS)"             TESTSUITE_CMDS="$(SSL_TS1_TEST_CMDS)"
   else
   run_SSL_TS1: FORCE
           @ $(ECHO) "PEGASUS_HAS_SSL not defined: Skipping run_SSL_TS1 poststarttest"
   
   endif
   
   
 ############################################################################### ###############################################################################
  
   
   
   ##############################################################################
   ##
   ## TestXMLRepository rule is used to run the poststarttests suite on
   ## the XML Repository built using cimmofl
   ##
   ## TestXMLRepositoryServer rule is used to run the poststarttests suite on
   ## the XML Repository built using cimmof
   ##
   ## TestXMLCmpRepository rule is used to run the poststarttest suite on
   ## the XML Compressed Repository built using cimmofl
   ##
   
   ############################
   ##
   ## TestXMLRepository
   ##
   
   TestXMLRepository: TestXMLClean TestXMLBuildRepo  TestXMLRepo
           @ $(ECHO) TestXMLRepository +++++ passed all test
   
   ############################
   ##
   ## TestXMLRepositoryServer
   ##
   TestXMLRepositoryServer: TestXMLClean  TestXMLBuildRepoServ TestXMLRepo
           @ $(ECHO) TestXMLRepositoryServer +++++ passed all test
   
   ############################
   ##
   ## TestXMLCmpRepository -  run poststarttest on Compressed BIN Repository
   ##
   ifdef PEGASUS_ENABLE_COMPRESSED_REPOSITORY
   TestXMLCmpRepository: FORCE
           @ $(ECHO) TestXMLCmpRepository +++++ Repository compressed by default - nothing more to test.
           @ $(ECHO) TestXMLCmpRepository +++++ passed all test
   else
   
   ifdef PEGASUS_ENABLE_COMPRESSED_REPOSITORY_TEST
   
   TestXMLCmpRepository: TestXMLClean  TestCmpBuild TestXMLBuildRepo TestXMLRepo TestRegBuild
           @ $(ECHO) TestXMLCmpRepository +++++ passed all test
   else
   TestXMLCmpRepository: FORCE
           @ $(ECHO) TestXMLCmpRepository +++++ Not tested
           @ $(ECHO) TestXMLCmpRepository +++++ refer to readme.compressed_repository
           @ $(ECHO) TestXMLCmpRepository +++++ to enable: set PEGASUS_ENABLE_COMPRESSED_REPOSITORY_TEST=true
   endif
   endif
   
   ###########################
   ##
   ## TestXMLClean
   ##
   TestXMLClean: FORCE
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryclean REPOSITORY_NAME=repository_xml
   
   
   ###########################
   ##
   ## TestXMLStartServer
   ##
   TestXMLStartServer: FORCE
           $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run
           - $(MKDIRHIER) $(PEGASUS_HOME)/repository_xml
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="repositoryDir=$(PEGASUS_HOME)/repository_xml"
           $(SLEEP) 5
   
   ####
   #### The following caused the cimserver to fail on startup
   ####
   ####    $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="enableBinRepository=false repositoryDir=$(PEGASUS_HOME)/repository_xml"
   
   ###########################
   ##
   ## TestXMLBuildRepo
   ##
   TestXMLBuildRepo: FORCE
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository REPOSITORY_NAME=repository_xml REPOSITORY_MODE=XML
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository REPOSITORY_NAME=repository_xml REPOSITORY_MODE=XML
   
   
   ###########################
   ##
   ## TestXMLBuildRepoServ
   ##
   TestXMLBuildRepoServ: TestXMLStartServer
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryServer REPOSITORY_NAME=repository_xml REPOSITORY_MODE=XML
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepositoryServer REPOSITORY_NAME=repository_xml REPOSITORY_MODE=XML
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
   
   
   ###########################
   ##
   ## TestXMLRepo
   ##
   TestXMLRepo: poststarttestsclean
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestXMLStartServer
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests REPOSITORY_NAME=repository_xml REPOSITORY_MODE=XML
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
   
   
   
   
   
   
 ############################################################################## ##############################################################################
 ## ##
 ## TestBinRepository rule is used to run the poststarttests suite on ## TestBinRepository rule is used to run the poststarttests suite on
Line 188 
Line 329 
 ### bug 3011 disabled Binary Repository testing on LINUX_IA64 to allow ### bug 3011 disabled Binary Repository testing on LINUX_IA64 to allow
 ### the nightly tests to run ### 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 TestBinRepository: TestBinClean TestBinBuildRepo  TestBinRepo
         @ $(ECHO) TestBinRepository +++++ passed all test         @ $(ECHO) TestBinRepository +++++ passed all test
 endif  
  
 ############################ ############################
 ## ##
Line 209 
Line 345 
 ## TestBinCmpRepository -  run poststarttest on Compressed BIN Repository ## TestBinCmpRepository -  run poststarttest on Compressed BIN Repository
 ## ##
 ifdef PEGASUS_ENABLE_COMPRESSED_REPOSITORY ifdef PEGASUS_ENABLE_COMPRESSED_REPOSITORY
 TestBinCmpRepository:  TestBinCmpRepository: FORCE
         @ $(ECHO) TestBinCmpRepository +++++ Repository compressed by default - nothing more to test.         @ $(ECHO) TestBinCmpRepository +++++ Repository compressed by default - nothing more to test.
         @ $(ECHO) TestBinCmpRepository +++++ passed all test         @ $(ECHO) TestBinCmpRepository +++++ passed all test
 else else
  
 ifdef PEGASUS_ENABLE_COMPRESSED_REPOSITORY_TEST ifdef PEGASUS_ENABLE_COMPRESSED_REPOSITORY_TEST
  
 TestBinCmpRepository: TestBinClean  TestBinCmpBuild TestBinBuildRepo TestBinRepo TestBinRegBuild  TestBinCmpRepository: TestBinClean  TestCmpBuild TestBinBuildRepo TestBinRepo TestRegBuild
         @ $(ECHO) TestBinCmpRepository +++++ passed all test         @ $(ECHO) TestBinCmpRepository +++++ passed all test
 else else
 TestBinCmpRepository:  TestBinCmpRepository: FORCE
         @ $(ECHO) TestBinCmpRepository +++++ Not tested         @ $(ECHO) TestBinCmpRepository +++++ Not tested
         @ $(ECHO) TestBinCmpRepository +++++ refer to readme.compressed_repository         @ $(ECHO) TestBinCmpRepository +++++ refer to readme.compressed_repository
         @ $(ECHO) TestBinCmpRepository +++++ to enable: set PEGASUS_ENABLE_COMPRESSED_REPOSITORY_TEST=true         @ $(ECHO) TestBinCmpRepository +++++ to enable: set PEGASUS_ENABLE_COMPRESSED_REPOSITORY_TEST=true
Line 227 
Line 363 
 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
 ## ##
 TestBinClean:  TestBinClean: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(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 repositoryclean REPOSITORY_NAME=repository_bin
  
Line 260 
Line 376 
 ## ##
 ## TestBinStartServer ## TestBinStartServer
 ## ##
 TestBinStartServer:  TestBinStartServer: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run
         - $(MKDIRHIER) $(PEGASUS_HOME)/repository_bin         - $(MKDIRHIER) $(PEGASUS_HOME)/repository_bin
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="enableBinaryRepository=true repositoryDir=$(PEGASUS_HOME)/repository_bin"         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="enableBinaryRepository=true repositoryDir=$(PEGASUS_HOME)/repository_bin"
Line 270 
Line 386 
 ## ##
 ## TestBinBuildRepo ## TestBinBuildRepo
 ## ##
 TestBinBuildRepo:  TestBinBuildRepo: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository REPOSITORY_NAME=repository_bin REPOSITORY_MODE=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) -f Makefile testrepository REPOSITORY_NAME=repository_bin REPOSITORY_MODE=BIN
  
Line 289 
Line 405 
 ## ##
 ## TestBinRepo ## TestBinRepo
 ## ##
 TestBinRepo: poststarttestsclean TestBinStartServer  TestBinRepo: poststarttestsclean
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestBinStartServer
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests REPOSITORY_NAME=repository_bin REPOSITORY_MODE=BIN         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests REPOSITORY_NAME=repository_bin REPOSITORY_MODE=BIN
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
  
  
  
   
   ############################
   ##
   ## TestCmpBuild - used to compile the repository for compression
   ##
   TestCmpBuild: FORCE
           @ $(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
   
   
   ############################
   ##
   ## TestRegBuild - used to compile the repository for no compression
   ##
   TestRegBuild: FORCE
           @ $(MAKE) "-SC" $(ROOT)/src/Pegasus/Repository clean
           @ $(MAKE) "-SC" $(ROOT)/src/Pegasus/Repository depend
           @ $(MAKE) "-SC" $(ROOT)/src/Pegasus/Repository
   
   
 ############################################################################### ###############################################################################
 ## ##
 ## Trace Configuration ## Trace Configuration

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