pegasus/TestMakefile - diff

Return to TestMakefile CVS log

Up to [Pegasus] / pegasus

Diff for /pegasus/TestMakefile between version 1.44 and 1.50

version 1.44, 2005/11/08 21:38:02

version 1.50, 2005/11/30 20:25:29

Line 62

$(USAGE)"standardtests - Execute an extended server test suites "

$(USAGE)" using multiple options."

$(USAGE)"serverquicktests - Executes a brief server test"

$(USAGE)"perftests - Executes a brief server performance test"

$(USAGE)

$(USAGE)"usage2 - usage on secondary test targets"

$(USAGE)"usagetrace - usage on trace targets"

Line 91

Line 92

$(USAGE)

$(USAGE)"run_SSL_TS1 - Executes the SSL tests"

$(USAGE)"run_OOP_TS1 - Executes the Out Of Process Provider tests"

$(USAGE)"run_G11N_TS1 - Executes the Globalization tests"

$(USAGE)

$(USAGE)"The following require the repository to be pre-built and the server to be started."

$(USAGE)

Line 226

Line 228

$(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Query/QueryExpression/tests/Queries -f Makefile clean

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

servertestssetup: FORCE

ifdef PEGASUS_HAS_SSL

# The association between user names and certificates is stored in the repository. If the

# repository is recreated, we also need to re-initialize the trust store directories.

# Otherwise, the truststore content will be out-of-sync with the mapping stored in the

# repository.

$(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile removeSSLTrustDirectories

$(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile createSSLTrustDirectories

endif

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

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

$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart

$(SLEEP) 5

ifdef PEGASUS_HAS_SSL

ifdef PEGASUS_TEST_USER_DEFINED

ssltrustmgr -a -c pegtest -f $(PEGASUS_HOME)/server.pem

endif

servertests: servertestsclean servertestssetup serversuite

@ $(ECHO) "+++++ TestMakefile servertests suites complete"

Line 241

Line 255

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

$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_INDSSL_TS1

$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_SSL_TS1

$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_G11N_TS1

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

Line 251

Line 267

@ $(ECHO) "+++++ TestMakefile serverquicktests complete"

serverquicksuite: FORCE

$(PEGASUS_HOME)/bin/TestClient

$(PEGASUS_HOME)/bin/Client

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

$(PEGASUS_HOME)/bin/TestClient

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

# perftests - simple performance test until we have better

# - Turns statistics on (uses TestInterop until we have better)

# - runs and times serverquicktests suite

# - runs cimperf to displat the statistics

# - turns statistics off

perftests: servertestsclean servertestssetup perfsuite

perfsuite: FORCE

$(PEGASUS_HOME)/bin/TestInterop on

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

@ $(ECHO) " "

$(TIME_CMD) $(PEGASUS_HOME)/bin/TestClient

@ $(ECHO) " "

$(TIME_CMD) $(PEGASUS_HOME)/bin/benchmarkTest

@ $(ECHO) " "

$(TIME_CMD) $(PEGASUS_HOME)/bin/cimperf

@ $(ECHO) " "

$(PEGASUS_HOME)/bin/TestInterop off

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

Line 281

Line 322

ifeq ($(OS),HPUX)

OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false

endif

ifeq ($(OS),linux)

OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false

endif

OOP_TS1_TEST_CMDS = \

TestClient

Line 312

Line 356

TESTSUITE_CMDS="$(IndInit_TS1b_TEST_CMDS)"

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

## Indication SSL Test Suite 1: Indication Testing over HTTPS

## Configuration Options: (none)

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

INDSSL_TS1a_CONFIG_OPTIONS = enableHttpsConnection=true enableAuthentication=false

INDSSL_TS1a_TEST_CMDS = \

$(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/IndicationStressTestProvider/testclient@@-f@@Makefile@@run_TS1_AuthenticationDisabled

INDSSL_TS1b_CONFIG_OPTIONS = enableHttpsConnection=true enableAuthentication=true sslClientVerificationMode=required

INDSSL_TS1b_TEST_CMDS = \

$(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/IndicationStressTestProvider/testclient@@-f@@Makefile@@run_TS1_AuthenticationEnabled

ifdef PEGASUS_HAS_SSL

run_INDSSL_TS1:

$(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \

CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1a_CONFIG_OPTIONS)" \

TESTSUITE_CMDS="$(INDSSL_TS1a_TEST_CMDS)"

$(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \

CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1b_CONFIG_OPTIONS)" \

TESTSUITE_CMDS="$(INDSSL_TS1b_TEST_CMDS)"

else

run_INDSSL_TS1: FORCE

@ $(ECHO) "PEGASUS_HAS_SSL not defined: Skipping run_INDSSL_TS1"

endif

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

## SSL Test Suite 1: SSL Tests

## Configuration Options: enableAuthentication=true

Line 336

Line 411

endif

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

## G11N Test Suite 1: Globalization Tests

## Configuration Options: forceProviderProcesses=false

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

G11N_TS1_CONFIG_OPTIONS = forceProviderProcesses=false

G11N_TS1_TEST_CMDS = \

$(MAKE) --directory $(PEGASUS_ROOT)/src/Clients/g11ntest \

-f Makefile g11ntest

run_G11N_TS1:

$(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \

CIMSERVER_CONFIG_OPTIONS="$(G11N_TS1_CONFIG_OPTIONS)" \

TESTSUITE_CMDS="$(G11N_TS1_TEST_CMDS)"

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

Legend:

Removed from v.1.44
changed lines
	Added in v.1.50

No CVS admin address has been configured