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

Diff for /pegasus/TestMakefile between version 1.33 and 1.41

version 1.33, 2005/05/12 23:18:04 version 1.41, 2005/10/26 22:22:17
Line 30 
Line 30 
 ## ##
 ## 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 50 
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
   
   new: FORCE
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile new
  
 buildmu:  clean: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile          $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile clean
         $(MKDIRHIER) $(BIN_DIR)  
  
 all: buildmu  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
   #
   ############################################################
   
   ##
   ## Although the macros CIMSERVER_STOP_SERVICE and CIMSERVER_START_SERVICE
   ## are available and could be invoked directly, their direct usage is
   ## discouraged in favor of invoking the cimstop and the cimstart rules
   ## as this allows one place where additional checks, delays etc may be
   ## added in the future to control or further test the servers performance
   ## in executing these commands.
   ##
   
   #######################
   #
   # 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)
         $(CIMSERVER_START_SERVICE)          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart
         $(SLEEP) 5         $(SLEEP) 5
         $(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  
  
 poststarttestsclean:  #####################
   #
   # servertests
   #
   
   servertestsclean: FORCE
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(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)  servertestssetup: FORCE
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart
         $(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 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)  ####################
   #
   # 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 163 
Line 319 
 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: 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 ## TestBinRepository rule is used to run the poststarttests suite on
Line 188 
Line 460 
 ### 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 476 
 ## 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 494 
 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 507 
 ## ##
 ## 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 517 
 ## ##
 ## 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 536 
 ## ##
 ## TestBinRepo ## TestBinRepo
 ## ##
 TestBinRepo: poststarttestsclean TestBinStartServer  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 346 
Line 615 
  
 # 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 355 
Line 624 
         $(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
Line 437 
Line 707 
         cimauth -a -u guest -n test1/test2/test3/test4/test5 -R -W         cimauth -a -u guest -n test1/test2/test3/test4/test5 -R -W
         cimauth -a -u guest -n test1/test2/test3/test4/test5/test6 -R -W         cimauth -a -u guest -n test1/test2/test3/test4/test5/test6 -R -W
  
 startcimWithoutSSL:  startcimWithoutSSL: FORCE
         $(CIMSERVER_START_SERVICE)          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart
         $(SLEEP) 5         $(SLEEP) 5
  
 startcimWithSSL:  startcimWithSSL: FORCE
         $(CIMSERVER_START_SERVICE) enableHttpConnection=false enableHttpsConnection=true          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="enableHttpConnection=false enableHttpsConnection=true"
         $(SLEEP) 5         $(SLEEP) 5

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