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

Diff for /pegasus/Makefile.ReleaseTest between version 1.9 and 1.16

version 1.9, 2005/05/27 17:29:01 version 1.16, 2006/09/15 17:51:33
Line 1 
Line 1 
 #//%2005////////////////////////////////////////////////////////////////////////  #//%2006////////////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 #// EMC Corporation; VERITAS Software Corporation; The Open Group. #// EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; Symantec Corporation; The Open Group.
 #// #//
 #// Permission is hereby granted, free of charge, to any person obtaining a copy #// Permission is hereby granted, free of charge, to any person obtaining a copy
 #// of this software and associated documentation files (the "Software"), to #// of this software and associated documentation files (the "Software"), to
Line 63 
Line 65 
 PRESTARTTEST_FILES = \ PRESTARTTEST_FILES = \
    TestAbstract \    TestAbstract \
    TestArray \    TestArray \
      TestAsyncQueue \
    TestBase64 \    TestBase64 \
    TestClassDecl \    TestClassDecl \
    TestDateTime \    TestDateTime \
Line 70 
Line 73 
    TestFormatter \    TestFormatter \
    TestHashTable \    TestHashTable \
    TestInstanceDecl \    TestInstanceDecl \
      TestList \
    TestLogger \    TestLogger \
    TestMethod \    TestMethod \
    TestObject \    TestObject \
Line 80 
Line 84 
    TestQualifier \    TestQualifier \
    TestQualifierDecl \    TestQualifierDecl \
    TestQualifierList \    TestQualifierList \
    TestQueue \  
    TestReference \    TestReference \
    TestResolve \    TestResolve \
    TestResponseHandler \    TestResponseHandler \
Line 91 
Line 94 
    TestString \    TestString \
    TestTimeValue \    TestTimeValue \
    TestToMof \    TestToMof \
      TestTracer \
    TestValidateClass \    TestValidateClass \
    TestValue \     TestValue
    TracerTest \  
    IPC  
  
 PEGASUS_TEST_PROVIDERS = \ PEGASUS_TEST_PROVIDERS = \
    libSampleInstanceProvider \    libSampleInstanceProvider \
    libSampleMethodProvider \    libSampleMethodProvider \
    libFamilyProvider     libFamilyProvider \
      libIndicationStressTestConsumer \
      libIndicationStressTestProvider
  
 POSTSTARTTEST_FILES = \ POSTSTARTTEST_FILES = \
    TestClient \    TestClient \
    OSTestClient \    OSTestClient \
    InvokeMethod2     TestPegClientInvokeMethod2 \
      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/TestPegClientInvokeMethod2 \
      $(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 121 
Line 129 
 stageTEST: stageTEST:
         @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)         @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/bin         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/bin
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/lib          @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB)
         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/mak         @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/mak
         @$(MAKE) --directory=$(ROOT) -f Makefile.ReleaseTest -s stage_makfiles         @$(MAKE) --directory=$(ROOT) -f Makefile.ReleaseTest -s stage_makfiles
         @$(MAKE) --directory=$(ROOT) -f Makefile.ReleaseTest -s stage_testproviderfiles         @$(MAKE) --directory=$(ROOT) -f Makefile.ReleaseTest -s stage_testproviderfiles
Line 134 
Line 142 
         @$(foreach i, $(MAK_FILES), $(COPY) $(TEST_MAK_FILES_SRCPATH)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/mak/$(i);)         @$(foreach i, $(MAK_FILES), $(COPY) $(TEST_MAK_FILES_SRCPATH)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/mak/$(i);)
  
 stage_testproviderfiles: stage_testproviderfiles:
         @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(COPY) $(TEST_LIB_FILES_SRCPATH)/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX);)          @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(COPY) $(TEST_LIB_FILES_SRCPATH)/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB)/$(i)$(LIB_SUFFIX);)
  
 stage_prestarttests: stage_prestarttests:
         @$(foreach i, $(PRESTARTTEST_FILES), $(COPY) $(TEST_BIN_FILES_SRCPATH)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/bin/$(i);)         @$(foreach i, $(PRESTARTTEST_FILES), $(COPY) $(TEST_BIN_FILES_SRCPATH)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/bin/$(i);)
Line 157 
Line 165 
  
 createMakefile_providerlinks: createMakefile_providerlinks:
         @$(ECHO-E) "create_providerlinks:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile         @$(ECHO-E) "create_providerlinks:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
         @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\t@$(MAKE) createlink OBJECT=$(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;)          @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\t@$(MAKE) createlink OBJECT=$(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB)/$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;)
         @$(ECHO-E) "" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile         @$(ECHO-E) "" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
         @$(ECHO-E) "remove_providerlinks:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile         @$(ECHO-E) "remove_providerlinks:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
         @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\trm -f $(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;)         @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\trm -f $(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;)
Line 234 
Line 242 
          @$(MAKE) --directory=$(ROOT) -f Makefile.ReleaseTest -s preinstall_setreleasepermissions          @$(MAKE) --directory=$(ROOT) -f Makefile.ReleaseTest -s preinstall_setreleasepermissions
  
 preinstall_setreleasepermissions: preinstall_setreleasepermissions:
         @$(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)/$(PEGASUS_ARCH_LIB)/$(i)$(LIB_SUFFIX);)
  
 _append_preunSectionToSpecFile: _append_preunSectionToSpecFile:
         @$(ECHO-E) "%if %{PEGASUS_BUILD_TEST_RPM}" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "%if %{PEGASUS_BUILD_TEST_RPM}" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 249 
Line 257 
 _append_filesSectionToSpecFile: _append_filesSectionToSpecFile:
         @$(ECHO-E) "%if %{PEGASUS_BUILD_TEST_RPM}" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(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)                         >> $(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) "%endif" >> $(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)  create_ProductInstallationVerificationScript:
           @$(RM) $(PEGASUS_HOME)/PegasusVerifyTestInstall
           @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS TEST DIRECTORIES\"" \
                >> $(PEGASUS_HOME)/PegasusVerifyTestInstall
           @$(ECHO-E) "ls -ld $(PEGASUS_TEST_DIR)" \
                >> $(PEGASUS_HOME)/PegasusVerifyTestInstall
           @$(ECHO-E) "ls -ld $(PEGASUS_TEST_DIR)/bin" \
                >> $(PEGASUS_HOME)/PegasusVerifyTestInstall
           @$(ECHO-E) "ls -ld $(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB)" \
                >> $(PEGASUS_HOME)/PegasusVerifyTestInstall
           @$(ECHO-E) "ls -ld $(PEGASUS_TEST_DIR)/mak" \
                >> $(PEGASUS_HOME)/PegasusVerifyTestInstall
           @$(ECHO-E) "ls -ld" \
               "$(PEGASUS_TEST_REPOSITORY_DIR)/$(PEGASUS_TEST_REPOSITORY_NAME)" \
                >> $(PEGASUS_HOME)/PegasusVerifyTestInstall
           @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS TEST MAKE FILES\"" \
                >> $(PEGASUS_HOME)/PegasusVerifyTestInstall
         @$(foreach i, $(MAK_FILES), $(ECHO-E) \         @$(foreach i, $(MAK_FILES), $(ECHO-E) \
               "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/mak/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)               "ls -l $(PEGASUS_TEST_DIR)/mak/$(i)" \
                >> $(PEGASUS_HOME)/PegasusVerifyTestInstall;)
           @$(ECHO-E) "ls -l $(PEGASUS_TEST_DIR)/Makefile" \
                >> $(PEGASUS_HOME)/PegasusVerifyTestInstall
           @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS TEST PROVIDER FILES\"" \
                >> $(PEGASUS_HOME)/PegasusVerifyTestInstall
           @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) \
                "ls -l $(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB)/$(i)$(LIB_SUFFIX)" \
                >> $(PEGASUS_HOME)/PegasusVerifyTestInstall;)
         @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) \         @$(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);)               "ls -l $(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \
                >> $(PEGASUS_HOME)/PegasusVerifyTestInstall;)
           @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS PRESTARTTEST FILES\"" \
                >> $(PEGASUS_HOME)/PegasusVerifyTestInstall
         @$(foreach i, $(PRESTARTTEST_FILES), $(ECHO-E) \         @$(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);)               "ls -l $(PEGASUS_TEST_DIR)/bin/$(i)" \
                >> $(PEGASUS_HOME)/PegasusVerifyTestInstall;)
           @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS POSTSTARTTEST FILES\"" \
                >> $(PEGASUS_HOME)/PegasusVerifyTestInstall
         @$(foreach i, $(POSTSTARTTEST_FILES), $(ECHO-E) \         @$(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);)               "ls -l $(PEGASUS_TEST_DIR)/bin/$(i)" \
         @$(ECHO-E) "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/Makefile" >> $(PEGASUS_RPM_SPEC_FILE_PATH)               >> $(PEGASUS_HOME)/PegasusVerifyTestInstall;)
         @$(ECHO-E) "%attr(-,$(CIMSERVER_USR),$(CIMSERVER_GRP)) $(PEGASUS_TEST_REPOSITORY_DIR)/$(PEGASUS_TEST_REPOSITORY_NAME)" \  
                        >> $(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.9  
changed lines
  Added in v.1.16
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2