Return to TestMakefile CVS log

Up to [Pegasus] / pegasus

BUG#: 2298
TITLE: Several test makefile fixes.

DESCRIPTION: Fixed a few things:

1. Most importantly, changed the SSL tests to use the existing macros for starting the CIM server and waiting for the server to start.  The inline versions were fine for UNIX, but were causing problems on Windows.

2. Changed two uses of echo to $(ECHO) for better portability.

3. Made some minor whitespace changes (indentation, etc.)

include $(PEGASUS_ROOT)/mak/config.mak
include $(PEGASUS_ROOT)/mak/test.mak

system = localhost

###############################################################################
##
## Test Makefile for Pegasus CIMOM
##
## Options:
##      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.
##
###############################################################################

###############################################################################
##
## Platform specific settings for several platforms.
##
## NOTE: Please add platform specific environment variables as appropriate.
##
###############################################################################

ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
    CIMSERVER_START_SERVICE = cimserver -start
    CIMSERVER_STOP_SERVICE = cimserver -stop
    SLEEP =
    REMOVE_PEGASUS_DIRECTORY = mu rmdirhier pegasus
    MUEXE = mu.exe
    MKDIR = $(MUEXE) mkdirhier
    TESTS = prestarttests poststarttests
endif

ifeq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU)
    CIMSERVER_START_SERVICE = cimserver
    CIMSERVER_STOP_SERVICE = cimserver -s; true
    SLEEP = sleep 5
    MUEXE = mu
    MKDIR = $(MUEXE) mkdirhier
    TESTS = prestarttests poststarttests
endif

ifeq ($(OS),HPUX)
    CIMSERVER_START_SERVICE = cimserver
    CIMSERVER_STOP_SERVICE = cimserver -s; true
    SLEEP = sleep 5
    MUEXE = mu
    MKDIR = $(MUEXE) mkdirhier
    TESTS = prestarttests poststarttests
endif

ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
    CIMSERVER_START_SERVICE = cimserver
    CIMSERVER_STOP_SERVICE = cimserver -s; true
    SLEEP = sleep 5
    MUEXE = mu
    MKDIR = $(MUEXE) mkdirhier
    TESTS = prestarttests poststarttests
endif

error:
	@ $(ECHO) "Specify desired makefile option (i.e., build, rebuild)"

buildmu:
	$(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile
	$(MKDIR) $(BIN_DIR)

rebuild: clean buildmu all

build: all

all: buildmu
	$(MAKE)  -f Makefile depend
	$(MAKE)  -f Makefile all

doc:
	$(MAKE) --directory=$(PEGASUS_ROOT)/doc/ProviderSpec -f Makefile
	$(MAKE) --directory=$(PEGASUS_ROOT)/doc/DevManual -f Makefile

clean:
	$(MAKE) -f Makefile clean

repositoryServer:
	$(CIMSERVER_STOP_SERVICE)
	$(SLEEP)
	$(RMDIRHIER) $(REPOSITORY_ROOT)
	$(CIMSERVER_START_SERVICE)
	$(SLEEP)
	$(MAKE) -f Makefile repositoryServer
	$(MAKE) -f Makefile testrepositoryServer

prestarttests:
	$(CIMSERVER_STOP_SERVICE)
	$(SLEEP)
	$(MAKE) -f Makefile repository
	$(MAKE) -f Makefile testrepository
	$(MAKE) -f Makefile tests
	$(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile install_run

poststarttests:
	$(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile clean
	$(CIMSERVER_START_SERVICE)
	$(SLEEP)
	$(MAKE) -f Makefile poststarttests

tests: $(TESTS)
ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
	$(CIMSERVER_STOP_SERVICE)
	$(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile uninstall
endif
	@ $(ECHO) Finished Tests

###############################################################################
##
## Trace Configuration
##
## Options:
##      XMLTraceOn: Enables XML request and response tracing.
##      ProviderLoadTraceOn: Enables Provider load tracing.
##      XML+ProviderLoadTraceOn: Enables both XML request/response and Provider
##                                 load tracing.
##      AllTraceOn: Enables all tracing.
##      AllTraceOff: Disables all tracing.
##      list: Lists trace settings.
##
###############################################################################

XMLTraceOn:
	cimconfig -s traceComponents=XmlIO -c
	cimconfig -s traceLevel=3 -c
	cimconfig -g traceComponents
	cimconfig -g traceLevel

ProviderLoadTraceOn:
	cimconfig -s traceComponents=ProvManager,OsAbstraction
	cimconfig -s traceLevel=3 -c
	cimconfig -g traceComponents
	cimconfig -g traceLevel

XML+ProviderLoadTraceOn:
	cimconfig -s traceComponents=XmlIO,ProvManager,OsAbstraction
	cimconfig -s traceLevel=3 -c
	cimconfig -g traceComponents
	cimconfig -g traceLevel

AllTraceOn:
	cimconfig -s traceComponents=ALL
	cimconfig -s traceLevel=3 -c
	cimconfig -g traceComponents
	cimconfig -g traceLevel

AllTraceOff:
	cimconfig -s traceComponents=
	cimconfig -g traceComponents
	cimconfig -g traceLevel

list:
	cimconfig -g traceComponents
	cimconfig -g traceLevel
	cimconfig -g traceFilePath

# DO NOT DELETE

standardtests:
	$(MAKE) -f TestMakefile -i DisableSecurity
	$(MAKE) -f TestMakefile TestCimmof
	$(MAKE) -f TestMakefile TestNoSecurity
	$(MAKE) -f TestMakefile EnableAuthentication
	$(MAKE) -f TestMakefile TestLocalSecurity
	$(MAKE) -f TestMakefile TestRemoteSecurity
	$(MAKE) -f TestMakefile EnableAuthorization
	$(MAKE) -f TestMakefile TestAuthorization

TestNoSecurity:
	$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile tests
	$(MAKE) -f TestMakefile RunTestClientLocal

TestLocalSecurity:
	$(MAKE) -f TestMakefile RunTestClientLocal
	$(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile poststarttests HOSTNAME= PORT= USER= PASSWORD= SECURITY_ENABLED=true

TestRemoteSecurity:
	TestClient -user guest -password guest $(system):5988
	$(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest/static -f Makefile poststarttests HOSTNAME=-h$(system) USER=-uguest PASSWORD=-wguest SECURITY_ENABLED=true

TestAuthorization:
	DeleteNamespace -a -user guest -password guest
	$(MAKE) -f TestMakefile RunTestClientLocal
	TestClient -user guest -password guest $(system):5988
	$(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest/static -f Makefile poststarttests HOSTNAME=-h$(system) USER=-uguest PASSWORD=-wguest SECURITY_ENABLED=true

TestSubscriptions:
	$(MAKE) -f TestMakefile DisableSecurity
	$(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile repository
	$(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository
	$(MAKE) -f TestMakefile startcimWithoutSSL
	$(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest/cimv2/Subscription -f Makefile poststarttests
	$(MAKE) -f TestMakefile stopcim

TestCimmof:
	$(MAKE) -f Testcimmof poststarttests


RunTestClientLocal:
	TestClient -local

DisableSecurity:
	$(MAKE) -f TestMakefile -i stopcim
	cimconfig -s enableAuthentication=false -p
	cimconfig -s enableNamespaceAuthorization=false -p

EnableAuthentication:
	$(MAKE) -f TestMakefile -i stopcim
	cimconfig -s enableAuthentication=true -p
	$(MAKE) -f TestMakefile startcimWithoutSSL
	$(MAKE) -f TestMakefile ConfigureUsers

EnableAuthorization:
	$(MAKE) -f TestMakefile -i stopcim
	cimconfig -s enableNamespaceAuthorization=true -p
	$(MAKE) -f TestMakefile startcimWithoutSSL
	$(MAKE) -f TestMakefile -i ConfigureAuthorizations

EnableSSL:
	$(MAKE) -f TestMakefile -i stopcim
	$(MAKE) -f TestMakefile startcimWithSSL

ConfigureUsers:
ifndef PEGASUS_PAM_AUTHENTICATION
	cimuser -a -u guest -w guest
endif

ConfigureAuthorizations:
	cimauth -a -u guest -n test/cimv2 -R -W
	cimauth -a -u guest -n root/cimv2 -R -W
	cimauth -a -u guest -n root/PG_Internal -R -W
	cimauth -a -u guest -n root/PG_InterOp -R -W
	cimauth -a -u guest -n root/benchmark -R -W
	cimauth -a -u guest -n root/sampleprovider -R -W
	cimauth -a -u guest -n test/static -R -W
	cimauth -a -u guest -n root/SampleProvider -R -W
	cimauth -a -u guest -n root -R -W
	cimauth -a -u guest -n test1 -R -W
	cimauth -a -u guest -n test2 -R -W
	cimauth -a -u guest -n test3 -R -W
	cimauth -a -u guest -n test4 -R -W
	cimauth -a -u guest -n test5 -R -W
	cimauth -a -u guest -n test6 -R -W
	cimauth -a -u guest -n test1/test2 -R -W
	cimauth -a -u guest -n test1/test2/test3 -R -W
	cimauth -a -u guest -n test1/test2/test3/test4 -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

startcimWithoutSSL:
	$(CIMSERVER_START_SERVICE)
	$(SLEEP)

startcimWithSSL:
	$(CIMSERVER_START_SERVICE) enableHttpConnection=false enableHttpsConnection=true
	$(SLEEP)

stopcim:
	$(CIMSERVER_STOP_SERVICE)
	$(SLEEP)

rebuild:
	$(MAKE) -f TestMakefile -i stopcim
	rm -f rebuild.txt
	$(MAKE) -f TestMakefile pegasus >> rebuild.txt  2>&1

pegasus:
	$(MAKE) -f Makefile rebuild