(file) Return to Makefile.ReleaseTest CVS log (file) (dir) Up to [Pegasus] / pegasus

Diff for /pegasus/Makefile.ReleaseTest between version 1.7 and 1.10

version 1.7, 2005/04/25 18:17:48 version 1.10, 2005/11/18 21:17:40
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.
   #//
   #//==============================================================================
 ifndef ROOT ifndef ROOT
  ifdef PEGASUS_ROOT  ifdef PEGASUS_ROOT
     ROOT =  $(subst \,/,$(PEGASUS_ROOT))     ROOT =  $(subst \,/,$(PEGASUS_ROOT))
Line 71 
Line 99 
 PEGASUS_TEST_PROVIDERS = \ PEGASUS_TEST_PROVIDERS = \
    libSampleInstanceProvider \    libSampleInstanceProvider \
    libSampleMethodProvider \    libSampleMethodProvider \
    libFamilyProvider     libFamilyProvider \
      libIndicationStressTestConsumer \
      libIndicationStressTestProvider
  
 POSTSTARTTEST_FILES = \ POSTSTARTTEST_FILES = \
    TestClient \    TestClient \
    OSTestClient \    OSTestClient \
    InvokeMethod2     InvokeMethod2 \
      TestIndicationStressTest
  
 POSTSTARTTEST_CMDS = \ POSTSTARTTEST_CMDS = \
    $(PEGASUS_TEST_DIR)/bin/TestClient@@-local \    $(PEGASUS_TEST_DIR)/bin/TestClient@@-local \
    $(PEGASUS_TEST_DIR)/bin/OSTestClient \    $(PEGASUS_TEST_DIR)/bin/OSTestClient \
    $(PEGASUS_TEST_DIR)/bin/InvokeMethod2     $(PEGASUS_TEST_DIR)/bin/InvokeMethod2 \
      $(PEGASUS_TEST_DIR)/bin/TestIndicationStressTest@@setup@@WQL \
      $(PEGASUS_TEST_DIR)/bin/TestIndicationStressTest@@run@@100@@1 \
      $(PEGASUS_TEST_DIR)/bin/TestIndicationStressTest@@cleanup
  
 TESTSUITE_CMDS_1 = \ TESTSUITE_CMDS_1 = \
    $(MAKE)@@poststarttests    $(MAKE)@@poststarttests
Line 209 
Line 243 
         @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(MAKE) -f $(ROOT)/Makefile.ReleaseTest setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX);)         @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(MAKE) -f $(ROOT)/Makefile.ReleaseTest setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX);)
  
 _append_preunSectionToSpecFile: _append_preunSectionToSpecFile:
           @$(ECHO-E) "%if %{PEGASUS_BUILD_TEST_RPM}" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%preun test" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "%preun test" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "make --directory $(PEGASUS_TEST_DIR) -s unsetupTEST"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "make --directory $(PEGASUS_TEST_DIR) -s unsetupTEST"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "[ -d $(PEGASUS_TEST_REPOSITORY_DIR)/$(PEGASUS_TEST_REPOSITORY_NAME) ] && \         @$(ECHO-E) "[ -d $(PEGASUS_TEST_REPOSITORY_DIR)/$(PEGASUS_TEST_REPOSITORY_NAME) ] && \
                        rm -rf $(PEGASUS_TEST_REPOSITORY_DIR)/$(PEGASUS_TEST_REPOSITORY_NAME);" >> \                        rm -rf $(PEGASUS_TEST_REPOSITORY_DIR)/$(PEGASUS_TEST_REPOSITORY_NAME);" >> \
                        $(PEGASUS_RPM_SPEC_FILE_PATH)                        $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%endif" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  
 _append_filesSectionToSpecFile: _append_filesSectionToSpecFile:
           @$(ECHO-E) "%if %{PEGASUS_BUILD_TEST_RPM}" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%files test"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "%files test"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)          @$(ECHO-E) "%defattr(-,$(INSTALL_USR),$(INSTALL_GRP),-)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "# Test Files"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)          @$(ECHO-E) "$(PEGASUS_TEST_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "#"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)          @$(ECHO-E) "$(PEGASUS_TEST_REPOSITORY_DIR)/$(PEGASUS_TEST_REPOSITORY_NAME)" \
         @$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/lib" >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/bin" >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/mak" >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(foreach i, $(MAK_FILES), $(ECHO-E) \  
               "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/mak/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)  
         @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) \  
               "%attr($(Pr_xr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)  
         @$(foreach i, $(PRESTARTTEST_FILES), $(ECHO-E) \  
               "%attr($(Pr_xr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/bin/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)  
         @$(foreach i, $(POSTSTARTTEST_FILES), $(ECHO-E) \  
               "%attr($(Pr_xr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/bin/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)  
         @$(ECHO-E) "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/Makefile" >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "%attr(-,$(CIMSERVER_USR),$(CIMSERVER_GRP)) $(PEGASUS_TEST_REPOSITORY_DIR)/$(PEGASUS_TEST_REPOSITORY_NAME)" \  
                        >> $(PEGASUS_RPM_SPEC_FILE_PATH)                        >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)          @$(ECHO-E) "%endif" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  

Legend:
Removed from v.1.7  
changed lines
  Added in v.1.10
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2