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

Diff for /pegasus/TestMakefile between version 1.33 and 1.34

version 1.33, 2005/05/12 23:18:04 version 1.34, 2005/05/19 10:49:35
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
  
   .PHONY: FORCE
   
   FORCE:
   
 rebuild: clean all tests rebuild: clean all tests
  
 build: all tests build: all tests
Line 169 
Line 200 
             TESTSUITE_CMDS="$(SSL_TS1_TEST_CMDS)"             TESTSUITE_CMDS="$(SSL_TS1_TEST_CMDS)"
 ############################################################################### ###############################################################################
  
   
   
   ##############################################################################
   ##
   ## 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 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 189 
Line 327 
 ### the nightly tests to run ### the nightly tests to run
  
 ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU) ifeq ($(PEGASUS_PLATFORM),LINUX_IA64_GNU)
 TestBinRepository:  TestBinRepository: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         @ $(ECHO) TestBinRepository +++++ NOT RUN on this platform - bug 3011         @ $(ECHO) TestBinRepository +++++ NOT RUN on this platform - bug 3011
 else else
Line 209 
Line 347 
 ## 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 365 
 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 378 
 ## ##
 ## 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 388 
 ## ##
 ## 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 295 
Line 413 
  
  
  
   
   ############################
   ##
   ## 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.34
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2