(file) Return to test.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/test.mak between version 1.9.6.1 and 1.17

version 1.9.6.1, 2003/08/13 19:39:49 version 1.17, 2005/10/21 19:18:12
Line 1 
Line 1 
   #//%2005////////////////////////////////////////////////////////////////////////
   #//
   #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
   #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
   #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
   #// IBM Corp.; EMC Corporation, The Open Group.
   #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
   #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// 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.
   #//
   #//==============================================================================
   
 ifeq ($(PEGASUS_PLATFORM), WIN32_IX86_MSVC) ifeq ($(PEGASUS_PLATFORM), WIN32_IX86_MSVC)
   CIMSERVER_START_SERVICE =  
   CIMSERVER_STOP_SERVICE =  
   SLEEP =  
   STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)   STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)
   DIFF = mu compare  
   REDIRECTERROR = 2>&1  
 else 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 =   STRIPCRS =
   DIFF = diff      endif
   REDIRECTERROR = 2>&1  
 endif endif
  
   REDIRECTERROR = 2>&1
   
   
 ifdef DIFF ifdef DIFF
   COMPARERESULTS = @$(DIFF) $(MASTERRESULTFILE) $(RESULTFILE)   COMPARERESULTS = @$(DIFF) $(MASTERRESULTFILE) $(RESULTFILE)
       COMPARERESULTS_DS = @$(call DIFFSORT,$(MASTERRESULTFILE),$(RESULTFILE))
 else else
   COMPARERESULTS = @$(ECHO) "Results not compared."   COMPARERESULTS = @$(ECHO) "Results not compared."
       COMPARERESULTS_DS = @$(ECHO) "Results not compared."
 endif endif
  
 ifdef PEGASUS_TMP ifdef PEGASUS_TMP
Line 30 
Line 58 
  
 #l10n #l10n
 messages: $(ERROR) messages: $(ERROR)
   
 cimstop:  
         $(CIMSERVER_STOP_SERVICE)  
         $(SLEEP)  
   
 cimstart:  
         $(CIMSERVER_START_SERVICE)  
         $(SLEEP)  
   


Legend:
Removed from v.1.9.6.1  
changed lines
  Added in v.1.17

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2