pegasus/mak/test.mak - diff

Return to test.mak CVS log

Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/test.mak between version 1.11 and 1.17.2.2

version 1.11, 2004/11/29 15:44:16

version 1.17.2.2, 2006/03/07 18:45:39

Line 1

#//%2006////////////////////////////////////////////////////////////////////////

#//

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

#// EMC Corporation; Symantec 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.

#//

#//==============================================================================

# The following are the user id's and passwords to be used by the tests.

# If they are not defined in the environment then they will be assigned

# here to the defaults. There are two user ID's and the coresponding

# passwords. One is for a reqular user that does not require priviledged

# (root) access and the other set for a user that has privileged (root) access.

# Use the folowing in a test that does not require privileged access

# PEGASUS_TEST_USER_ID

# PEGASUS_TEST_USER_PASS

# Use the following in test that requires a privileged user's access

# PEGASUS_TEST_PRIV_USER_ID

# PEGASUS_TEST_PRIV_USER_PASS

# Currently PEGASUS_TEST_USER_ID and PEGASUS_TEST_USER_PASS both default to

# guest if they are not specified within the users environment.

# Currently (Feb. 10, 2006) PEGASUS_TEST_PRIV_USER_ID and

# PEGASUS_TEST_PRIV_USER_PASS are not used and therefore they have no

# default value. When they are taken into use it may be desirable to have

# a default value that will never be used to make errors when they are not

# assigned a valid value more meaningful. An error of the form

# "guestroot user does not exist" rather than "user does not exist"

# would make it easier to find the problem because "guestroot" could be

# found in the tree and determined to come from the default value of

# PEGASUS_TEST_PRIVUSER_ID. JR Wunderlich Feb 10, 2006

ifndef PEGASUS_TEST_USER_ID

PEGASUS_TEST_USER_ID=guest

endif

ifndef PEGASUS_TEST_USER_PASS

PEGASUS_TEST_USER_PASS=guest

endif

# ifndef PEGASUS_TEST_PRIV_USER_ID

# PEGASUS_TEST_PRIV_USER_ID=guestroot

# endif

# ifndef PEGASUS_TEST_PRIV_USER_PASS

# PEGASUS_TEST_PRIV_USER_PASS=guestroot

# endif

ifeq ($(PEGASUS_PLATFORM), WIN32_IX86_MSVC)

CIMSERVER_START_SERVICE =

CIMSERVER_STOP_SERVICE =

SLEEP = mu sleep 5

STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)

DIFF = mu compare

REDIRECTERROR = 2>&1

else

CIMSERVER_START_SERVICE = cimserver

ifeq ($(PEGASUS_OS_TYPE), VMS)

CIMSERVER_STOP_SERVICE = /usr/bin/ps -ef | /usr/bin/grep cimserver | /usr/bin/grep -v grep | /usr/bin/awk '{print "kill -9 "$$2 |"/usr/bin/sh"}'

STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)

SLEEP = sleep 5

else

STRIPCRS =

DIFF = diff

endif

REDIRECTERROR = 2>&1

endif

REDIRECTERROR = 2>&1

ifdef DIFF

COMPARERESULTS = @$(DIFF) $(MASTERRESULTFILE) $(RESULTFILE)

COMPARERESULTS_DS = @$(call DIFFSORT,$(MASTERRESULTFILE),$(RESULTFILE))

else

COMPARERESULTS = @$(ECHO) "Results not compared."

COMPARERESULTS_DS = @$(ECHO) "Results not compared."

endif

ifdef PEGASUS_TMP

Line 30

Line 109

#l10n

messages: $(ERROR)

cimstop:

$(CIMSERVER_STOP_SERVICE)

$(SLEEP)

cimstart:

$(CIMSERVER_START_SERVICE)

$(SLEEP)

Legend:

Removed from v.1.11
changed lines
	Added in v.1.17.2.2

No CVS admin address has been configured