pegasus/TestMakefile - diff

Return to TestMakefile CVS log

Up to [Pegasus] / pegasus

Diff for /pegasus/TestMakefile between version 1.29 and 1.33

version 1.29, 2005/05/09 22:08:33

version 1.33, 2005/05/12 23:18:04

Line 1

#//%2005////////////////////////////////////////////////////////////////////////

#//

#// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

#// IBM Corp.; EMC Corporation, The Open Group.

#// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

#// 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

Line 61

Line 89

$(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/Query/QueryExpression/tests/Queries -f Makefile clean

$(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile clean

poststarttests: poststarttestsclean

$(CIMSERVER_START_SERVICE)

$(SLEEP) 5

$(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_IndInit_TS1

Line 141

Line 171

##############################################################################

## TestBinReposiory rule is used to run the poststarttests suite on

## TestBinRepository rule is used to run the poststarttests suite on

## the Binary Reposiory.

## the Binary Repository built using cimmofl

## Running the poststarttests as part of the nightly's I have three choices.

## TestBinRepositoryServer rule is used to run the poststarttests suite on

## 1. a)remove repository,

## the Binary Repository built using cimmof

## b)build bin repository as repository,

## c)run test,

## d)remove repository,

## e)build xml repository.

## 2. a)build bin repository as repository_bin,

## TestBinCmpRepository rule is used to run the poststarttest suite on

## b)run test on repository_bin

## the Binry Compressed Repository built using cimmofl

############################

## Currently scenaerio 1 works but it is slow.

## TestBinRepository

## Scenaerio 2 is close to working. There may be a few test remaining that

## don't honor the REPOSITORY_NAME build config variable.

### 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

TestBinRepository: TestBinRepository2

############################

$(ECHO) TestBinRepository +++++ passed all test

## 1. a)remove repository,

## TestBinCmpRepository - run poststarttest on Compressed BIN Repository

## b)build bin repository as repository,

## c)run test,

## d)remove repository,

## e)build xml repository.

TestBinRepository1:

ifdef PEGASUS_ENABLE_COMPRESSED_REPOSITORY

$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop

TestBinCmpRepository:

$(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryclean

@ $(ECHO) TestBinCmpRepository +++++ Repository compressed by default - nothing more to test.

$(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository REPOSITORY_MODE=BIN

@ $(ECHO) TestBinCmpRepository +++++ passed all test

$(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository REPOSITORY_MODE=BIN

else

$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart CIMSERVER_CONFIG_OPTIONS="enableBinaryRepository=true"

$(SLEEP) 5

ifdef PEGASUS_ENABLE_COMPRESSED_REPOSITORY_TEST

$(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests REPOSITORY_MODE=BIN

$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop

TestBinCmpRepository: TestBinClean TestBinCmpBuild TestBinBuildRepo TestBinRepo TestBinRegBuild

$(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repositoryclean

@ $(ECHO) TestBinCmpRepository +++++ passed all test

$(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository

else

$(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository

TestBinCmpRepository:

@ $(ECHO) TestBinCmpRepository +++++ Not tested

@ $(ECHO) TestBinCmpRepository +++++ refer to readme.compressed_repository

@ $(ECHO) TestBinCmpRepository +++++ to enable: set PEGASUS_ENABLE_COMPRESSED_REPOSITORY_TEST=true

endif

############################

## 2. a)build bin repository as repository_bin,

## TestBinCmpBuild - used to compile the repository for compression

## b)run test on repository_bin

TestBinRepository2:

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

$(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:

$(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

$(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile poststarttests REPOSITORY_NAME=repository_bin REPOSITORY_MODE=BIN

###########################

## 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

###############################################################################

Legend:

Removed from v.1.29
changed lines
	Added in v.1.33

No CVS admin address has been configured