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

Diff for /pegasus/TestMakefile between version 1.30 and 1.40

version 1.30, 2005/05/10 02:55:54 version 1.40, 2005/10/23 00:58:12
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
 ## ##
 ## Options:  ## see the usage rule for documentation of rules etc.
 ##      rebuild            - Rebuild  ##
 ##      build              - Build  
 ##      prestarttests      - Execute functional tests  
 ##      poststarttests     - Execute poststarttests (No security, No SSL)  
 ##      tests              - Execute prestarttests and poststarttests  
 ##      standardtests      - Execute poststartests and a series of  
 ##                           posstarttests using multiple options.  
 ## ##
 ############################################################################### ###############################################################################
  
 error: error:
         @ $(ECHO) "Specify desired makefile option (i.e., build, rebuild)"          @ $(ECHO) "Specify desired makefile option (i.e., unittests, usage )"
  
 include $(PEGASUS_ROOT)/mak/config.mak include $(PEGASUS_ROOT)/mak/config.mak
 include $(PEGASUS_ROOT)/mak/test.mak include $(PEGASUS_ROOT)/mak/test.mak
Line 22 
Line 44 
  
 system = localhost system = localhost
  
 TESTS = prestarttests poststarttests  .PHONY: FORCE
  
 rebuild: clean all tests  FORCE:
  
 build: all tests  usage: FORCE
           $(USAGE)
           $(USAGE)"TestMakefile Primary Targets:"
           $(USAGE)
           $(USAGE)"The following are all standalone tests. They stop and start the server,"
           $(USAGE)"and build repositories as needed."
           $(USAGE)
           $(USAGE)"alltests           - Execute unittests and servertests"
           $(USAGE)"unittests          - Execute the unit functional tests - no repository"
           $(USAGE)"                     or active server is required"
           $(USAGE)"servertests        - Execute a basic server test suites (No security, No SSL)"
           $(USAGE)"standardtests      - Execute an extended server test suites "
           $(USAGE)"                     using multiple options."
           $(USAGE)"serverquicktests   - Executes a brief server test"
           $(USAGE)
           $(USAGE)"usage2             - usage on secondary test targets"
           $(USAGE)
   
   usage2: FORCE
           $(USAGE)
           $(USAGE)"TestMakefile Secondary Targets:"
           $(USAGE)
           $(USAGE)"The following are run as part of the Primary target test suites and may"
           $(USAGE)"also be invoked as standalone tests."
           $(USAGE)
           $(USAGE)"TestXMLRepository       - Executes poststarttests on XML repository"
           $(USAGE)"                          built with cimmofl."
           $(USAGE)"TestXMLRepositoryServer - Executes poststarttests on XML repository"
           $(USAGE)"                          built with cimmof."
           $(USAGE)"TestXMLCmpRepository    - Executes poststarttests on XML compressed"
           $(USAGE)"                          repository built with cimmofl."
           $(USAGE)"TestBinRepository       - Executes poststarttests on binary repository "
           $(USAGE)"                          built with cimmofl."
           $(USAGE)"TestBinRepositoryServer - Executes poststarttests on binary repository"
           $(USAGE)"                          built with cimmof."
           $(USAGE)"TestBinCmpRepository    - Executes poststarttests on binary compressed"
           $(USAGE)"                          repository built with cimmofl."
           $(USAGE)
           $(USAGE)"The following require the repository to be pre-built."
           $(USAGE)
           $(USAGE)"run_SSL_TS1             - Executes the SSL tests"
           $(USAGE)"run_OOP_TS1             - Executes the Out Of Process Provider tests"
           $(USAGE)
           $(USAGE)"The following require the repository to be pre-built and the server to be started."
           $(USAGE)
           $(USAGE)"serversuite             - the collection of test run by the servertests rule"
           $(USAGE)"serverquicksuite        - The collection of test run by the serverquicktests rule"
           $(USAGE)
   
   
   ##########################################################
   #
   # rules that are defined in Makefile
   #
   ##########################################################
   
   build: FORCE
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile build
  
 clean:  world: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile clean          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile world
  
 buildmu:  new: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile new
         $(MKDIRHIER) $(BIN_DIR)  
  
 all: buildmu  clean: FORCE
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile clean
   
   depend: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile depend         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile depend
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile all  
  
   
   ############################################################
   #
   # rules defined here
   #
   ############################################################
   
   #######################
   #
   # doc
   #
 doc: doc:
         $(MAKE) --directory=$(PEGASUS_ROOT)/doc/ProviderSpec -f Makefile         $(MAKE) --directory=$(PEGASUS_ROOT)/doc/ProviderSpec -f Makefile
         $(MAKE) --directory=$(PEGASUS_ROOT)/doc/DevManual -f Makefile         $(MAKE) --directory=$(PEGASUS_ROOT)/doc/DevManual -f Makefile
  
 repositoryServer:  
   #######################
   #
   # repositoryServer
   #
   repositoryServer: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(SLEEP) 5         $(SLEEP) 5
         $(RMDIRHIER) $(REPOSITORY_ROOT)         $(RMDIRHIER) $(REPOSITORY_ROOT)
Line 52 
Line 148 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryServer         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryServer
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepositoryServer         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepositoryServer
  
 prestarttests:  ######################
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop  #
         $(SLEEP) 5  # prestarttests is being deprecated since poststarttest is being deprecated
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository  # in favor of name more related to its intended functionality.
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository  #
   prestarttests: prestarttests_msg shortsleep unittests
   
   prestarttests_msg: FORCE
           @$(ECHO) "=============================================================================="
           @$(ECHO) "TestMakefile: The \"prestarttests\" rule is being deprecated."
           @$(ECHO) "              Use \"make testusage\" for a description of the usage model."
           @$(ECHO) "              The equivalent new rule is \"unittests\"."
           @$(ECHO) "              Invoking the \"unittests\" rule now."
           @$(ECHO) "=============================================================================="
   
   ####################
   #
   # poststarttests is being deprecated since it multiply defines a
   # recursive make rule leading to ambuguity and confusion.
   #
   poststarttests: poststarttests_msg shortsleep servertests
   
   poststarttests_msg: FORCE
           @$(ECHO) "==============================================================================="
           @$(ECHO) "TestMakefile: The \"posstarttests\" rule is being deprecated.."
           @$(ECHO) "              Use \"make testusage\" for a description of the usage model."
           @$(ECHO) "              The equivalent new rule is \"servertests\"."
           @$(ECHO) "              Invoking the \"servertests\" rule now."
           @$(ECHO) "==============================================================================="
   
   #####################
   #
   # tests is being deprecated since it multiply defines a
   # recursive make rule leading to ambuguity and confusion.
   #
   tests: tests_msg shortsleep alltests
   
   tests_msg: FORCE
           @$(ECHO) "==================================================================="
           @$(ECHO) "TestMakefile: The \"tests\" rule is being deprecated."
           @$(ECHO) "              Use \"make testusage\" for a description of the usage model."
           @$(ECHO) "              The equivalent new rule is \"alltests\"."
           @$(ECHO) "              Invoking the \"alltests\" rule now."
           @$(ECHO) "==================================================================="
   
   
   shortsleep: FORCE
           @$(SLEEP) 5
   
   ####################
   #
   # unittests
   #
   unittests: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile tests         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile tests
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run          @ $(ECHO) "+++++ TestMakefile unittests complete"
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Clients/ssltrustmgr/tests -f Makefile test_setup  
   #####################
   #
   # servertests
   #
  
 poststarttests:  servertestsclean: FORCE
           -$(CIMSERVER_STOP_SERVICE)
         $(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
   
   
   servertestssetup: FORCE
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository
         $(CIMSERVER_START_SERVICE)         $(CIMSERVER_START_SERVICE)
         $(SLEEP) 5         $(SLEEP) 5
   
   servertests: servertestsclean servertestssetup serversuite
           @ $(ECHO) "+++++ TestMakefile servertests suites complete"
   
   serversuite: FORCE
         $(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 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)  ####################
   #
   # serverquicktests
   #
   serverquicktests: servertestsclean servertestssetup serverquicksuite
           @ $(ECHO) "+++++ TestMakefile serverquicktests complete"
   
   serverquicksuite: FORCE
           $(PEGASUS_HOME)/bin/TestClient
           $(PEGASUS_HOME)/bin/Client
           $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile poststarttests
   
   ####################
   #
   # alltests
   #
   alltests: unittests servertests
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC) ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(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) "+++++ TestMakefile alltests Complete"
  
 ############################################################################### ###############################################################################
 ##  Test Suite Definitions ##  Test Suite Definitions
Line 133 
Line 310 
 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
   
   
 ############################################################################### ###############################################################################
  
   
   
 ############################################################################## ##############################################################################
 ## ##
 ## TestBinReposiory rule is used to run the poststarttests suite on  ## TestXMLRepository rule is used to run the poststarttests suite on
 ## the Binary Reposiory.  ## 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
 ## ##
 ## 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,  ## TestXMLRepository
 ##    d)remove repository,  
 ##    e)build xml repository.  
 ## ##
 ## 2. a)build bin repository as repository_bin,  
 ##    b)run test on repository_bin  TestXMLRepository: TestXMLClean TestXMLBuildRepo  TestXMLRepo
           @ $(ECHO) TestXMLRepository +++++ passed all test
   
   ############################
   ##
   ## TestXMLRepositoryServer
   ##
   TestXMLRepositoryServer: TestXMLClean  TestXMLBuildRepoServ TestXMLRepo
           @ $(ECHO) TestXMLRepositoryServer +++++ passed all test
   
   ############################
 ## ##
 ## Currently scenaerio 1 works but it is slow.  ## TestXMLCmpRepository -  run poststarttest on Compressed BIN Repository
 ## Scenaerio 2 is close to working. There may be a few test remaining that  
 ## don't honor the REPOSITORY_NAME build config variable.  
 ## ##
   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
  
 TestBinRepository: TestBinRepository2  ###########################
         $(ECHO) TestBinRepository +++++ passed all test  
 ## ##
 ## 1. a)remove repository,  ## TestXMLClean
 ##    b)build bin repository as repository,  
 ##    c)run test,  
 ##    d)remove repository,  
 ##    e)build xml repository.  
 ## ##
 TestBinRepository1:  TestXMLClean: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryclean          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryclean REPOSITORY_NAME=repository_xml
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository REPOSITORY_MODE=BIN  
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository REPOSITORY_MODE=BIN  
   ###########################
   ##
   ## TestXMLStartServer
   ##
   TestXMLStartServer: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="enableBinaryRepository=true"          - $(MKDIRHIER) $(PEGASUS_HOME)/repository_xml
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="repositoryDir=$(PEGASUS_HOME)/repository_xml"
         $(SLEEP) 5         $(SLEEP) 5
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests REPOSITORY_MODE=BIN  
   ####
   #### 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         $(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  ###########################
   ##
   ## TestXMLRepo
   ##
   TestXMLRepo: servertestsclean
           $(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
   ## 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
   
   TestBinRepository: TestBinClean TestBinBuildRepo  TestBinRepo
           @ $(ECHO) TestBinRepository +++++ passed all test
   
   
   ############################
   ##
   ## TestBinRepositoryServer
   ##
   TestBinRepositoryServer: TestBinClean  TestBinBuildRepoServ TestBinRepo
           @ $(ECHO) TestBinRepositoryServer +++++ passed all test
   
   ############################
   ##
   ## TestBinCmpRepository -  run poststarttest on Compressed BIN Repository
   ##
   ifdef PEGASUS_ENABLE_COMPRESSED_REPOSITORY
   TestBinCmpRepository: FORCE
           @ $(ECHO) TestBinCmpRepository +++++ Repository compressed by default - nothing more to test.
           @ $(ECHO) TestBinCmpRepository +++++ passed all test
   else
   
   ifdef PEGASUS_ENABLE_COMPRESSED_REPOSITORY_TEST
   
   TestBinCmpRepository: TestBinClean  TestCmpBuild TestBinBuildRepo TestBinRepo TestRegBuild
           @ $(ECHO) TestBinCmpRepository +++++ passed all test
   else
   TestBinCmpRepository: FORCE
           @ $(ECHO) TestBinCmpRepository +++++ Not tested
           @ $(ECHO) TestBinCmpRepository +++++ refer to readme.compressed_repository
           @ $(ECHO) TestBinCmpRepository +++++ to enable: set PEGASUS_ENABLE_COMPRESSED_REPOSITORY_TEST=true
   endif
   endif
   
   
   ###########################
 ## ##
 ## 2. a)build bin repository as repository_bin,  ## TestBinClean
 ##    b)run test on repository_bin  
 ## ##
 TestBinRepository2:  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
         $(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  
   ###########################
   ##
   ## 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
         $(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"
         $(SLEEP) 5         $(SLEEP) 5
   
   ###########################
   ##
   ## TestBinBuildRepo
   ##
   TestBinBuildRepo: FORCE
           $(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: servertestsclean
           $(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
Line 252 
Line 606 
  
 # More options... # More options...
  
 standardtests:  standardtests: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i DisableSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i DisableSecurity
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestCimmof         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestCimmof
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestNoSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestNoSecurity
Line 261 
Line 615 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestRemoteSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestRemoteSecurity
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthorization         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthorization
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestAuthorization         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestAuthorization
           @ $(ECHO) "+++++ TestMakefile standardtests complete"
  
 TestNoSecurity: TestNoSecurity:
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile tests         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile tests


Legend:
Removed from v.1.30  
changed lines
  Added in v.1.40

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2