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

Diff for /pegasus/test/config.mak between version 1.19 and 1.19.2.2

version 1.19, 2011/01/12 13:21:46 version 1.19.2.2, 2013/06/03 22:37:07
Line 46 
Line 46 
 XMLRESPONSES_STRIPPED = $(XMLREQUESTS_STRIPPED:.xml=.rsp_stripped) XMLRESPONSES_STRIPPED = $(XMLREQUESTS_STRIPPED:.xml=.rsp_stripped)
 XMLGOODRESPONSE_STRIPPED = $(XMLREQUESTS_STRIPPED:.xml=rspgood.xml.stripped) XMLGOODRESPONSE_STRIPPED = $(XMLREQUESTS_STRIPPED:.xml=rspgood.xml.stripped)
  
   ifeq ($(OS),$(filter $(OS),linux zos))
   XMLREQUESTS_STRIPPED_MU = $(foreach i, $(XMLSCRIPTS_STRIPPED_MU), $i.xml)
   XMLRESPONSES_STRIPPED_MU = $(XMLREQUESTS_STRIPPED_MU:.xml=.rsp_stripped_diff)
   XMLGOODRESPONSE_STRIPPED_MU = $(XMLREQUESTS_STRIPPED_MU:.xml=rspgood.xml.stripped)
   else
   XMLREQUESTS_STRIPPED_MU = $(foreach i, $(XMLSCRIPTS_STRIPPED_MU), $i.xml)
   XMLRESPONSES_STRIPPED_MU = $(XMLREQUESTS_STRIPPED_MU:.xml=.rsp_stripped_mu)
   XMLGOODRESPONSE_STRIPPED_MU = $(XMLREQUESTS_STRIPPED_MU:.xml=rspgood.xml.stripped)
   endif
   
 XMLREQUESTS_DS_STRIPPED = $(foreach i, $(XMLSCRIPTS_DS_STRIPPED), $i.xml) XMLREQUESTS_DS_STRIPPED = $(foreach i, $(XMLSCRIPTS_DS_STRIPPED), $i.xml)
 XMLRESPONSES_DS_STRIPPED = $(XMLREQUESTS_DS_STRIPPED:.xml=.rsp_ds_stripped) XMLRESPONSES_DS_STRIPPED = $(XMLREQUESTS_DS_STRIPPED:.xml=.rsp_ds_stripped)
 XMLGOODRESPONSE_DS_STRIPPED = $(XMLREQUESTS_DS_STRIPPED:.xml=rspgood.xml.stripped) XMLGOODRESPONSE_DS_STRIPPED = $(XMLREQUESTS_DS_STRIPPED:.xml=rspgood.xml.stripped)
  
   
 WBEMEXECOPTIONS = $(HOSTNAME) $(PORT) $(HTTPMETHOD) $(HTTPVERSION) $(USER) $(PASSWORD) $(SSL) WBEMEXECOPTIONS = $(HOSTNAME) $(PORT) $(HTTPMETHOD) $(HTTPVERSION) $(USER) $(PASSWORD) $(SSL)
  
 %.rsp: %.xml %.rsp: %.xml
Line 67 
Line 76 
         @ $(RM) $(TMP_DIR)/$*.rsp_ds         @ $(RM) $(TMP_DIR)/$*.rsp_ds
         @ $(ECHO) +++ $* passed successfully +++         @ $(ECHO) +++ $* passed successfully +++
  
   
 %.rsp_stripped: %.xml %.rsp_stripped: %.xml
         @ wbemexec $(WBEMEXECOPTIONS) $*.xml > $(TMP_DIR)/$*.rsp_stripped || cd .         @ wbemexec $(WBEMEXECOPTIONS) $*.xml > $(TMP_DIR)/$*.rsp_stripped || cd .
         @ $(COPY) $*rspgood.xml $(TMP_DIR)/$*rspgood.xml.stripped         @ $(COPY) $*rspgood.xml $(TMP_DIR)/$*rspgood.xml.stripped
         @ $(STRIPL) $(STRIPLINES) $(TMP_DIR)/$*.rsp_stripped         @ $(STRIPL) $(STRIPLINES) $(TMP_DIR)/$*.rsp_stripped
         @ $(STRIPL) $(STRIPLINES) $(TMP_DIR)/$*rspgood.xml.stripped         @ $(STRIPL) $(STRIPLINES) $(TMP_DIR)/$*rspgood.xml.stripped
         @ $(DIFF) $*rspgood.xml.stripped $(TMP_DIR)/$*.rsp_stripped          @ $(DIFF) $(TMP_DIR)/$*rspgood.xml.stripped $(TMP_DIR)/$*.rsp_stripped
         @ $(RM) $(TMP_DIR)/$*.rsp_stripped         @ $(RM) $(TMP_DIR)/$*.rsp_stripped
         @ $(RM) $(TMP_DIR)/$*rspgood.xml.stripped         @ $(RM) $(TMP_DIR)/$*rspgood.xml.stripped
         @ $(ECHO) +++ $* passed successfully +++         @ $(ECHO) +++ $* passed successfully +++
  
   # if OS = linux
   %.rsp_stripped_diff: %.xml
           @ wbemexec $(WBEMEXECOPTIONS) $*.xml > $(TMP_DIR)/$*.rsp_stripped_mu || cd .
           @ $(COPY) $*rspgood.xml $(TMP_DIR)/$*rspgood.xml.stripped
           @ $(STRIPL) $(STRIPLINES) $(TMP_DIR)/$*.rsp_stripped_mu
           @ $(STRIPL) $(STRIPLINES) $(TMP_DIR)/$*rspgood.xml.stripped
           @ $(DIFF) -I $(DIFFLINE1) -I $(DIFFLINE2) $(TMP_DIR)/$*rspgood.xml.stripped $(TMP_DIR)/$*.rsp_stripped_mu
           @ $(RM) $(TMP_DIR)/$*.rsp_stripped_mu
           @ $(RM) $(TMP_DIR)/$*rspgood.xml.stripped
           @ $(ECHO) +++ $* passed successfully +++
   
   # if OS!=linux
   %.rsp_stripped_mu: %.xml
           @ wbemexec $(WBEMEXECOPTIONS) $*.xml > $(TMP_DIR)/$*.rsp_stripped_mu || cd .
           @ $(COPY) $*rspgood.xml $(TMP_DIR)/$*rspgood.xml.stripped
           @ $(STRIPL) $(STRIPLINES) $(TMP_DIR)/$*.rsp_stripped_mu
           @ $(STRIPL) $(STRIPLINES) $(TMP_DIR)/$*rspgood.xml.stripped
           @ $(MU) $(MULINES) $(TMP_DIR)/$*.rsp_stripped_mu
           @ $(MU) $(MULINES) $(TMP_DIR)/$*rspgood.xml.stripped
           @ $(DIFF) $(TMP_DIR)/$*rspgood.xml.stripped $(TMP_DIR)/$*.rsp_stripped_mu
           @ $(RM) $(TMP_DIR)/$*.rsp_stripped_mu
           @ $(RM) $(TMP_DIR)/$*rspgood.xml.stripped
           @ $(ECHO) +++ $* passed successfully +++
  
 %.rsp_ds_stripped: %.xml %.rsp_ds_stripped: %.xml
         @ wbemexec $(WBEMEXECOPTIONS) $*.xml > $(TMP_DIR)/$*.rsp_ds_stripped || cd .         @ wbemexec $(WBEMEXECOPTIONS) $*.xml > $(TMP_DIR)/$*.rsp_ds_stripped || cd .
         @ $(COPY) $*rspgood.xml $(TMP_DIR)/$*rspgood.xml.stripped         @ $(COPY) $*rspgood.xml $(TMP_DIR)/$*rspgood.xml.stripped
         @ $(STRIPL) $(STRIPLINES_DS) $(TMP_DIR)/$*.rsp_ds_stripped         @ $(STRIPL) $(STRIPLINES_DS) $(TMP_DIR)/$*.rsp_ds_stripped
         @ $(STRIPL) $(STRIPLINES_DS) $(TMP_DIR)/$*rspgood.xml.stripped         @ $(STRIPL) $(STRIPLINES_DS) $(TMP_DIR)/$*rspgood.xml.stripped
         @ $(call DIFFSORT,$*rspgood.xml.stripped,$(TMP_DIR)/$*.rsp_ds_stripped)          @ $(call DIFFSORT,$(TMP_DIR)/$*rspgood.xml.stripped,$(TMP_DIR)/$*.rsp_ds_stripped)
         @ $(RM) $(TMP_DIR)/$*.rsp_ds_stripped         @ $(RM) $(TMP_DIR)/$*.rsp_ds_stripped
         @ $(RM) $(TMP_DIR)/$*rspgood.xml.stripped         @ $(RM) $(TMP_DIR)/$*rspgood.xml.stripped
         @ $(ECHO) +++ $* passed successfully +++         @ $(ECHO) +++ $* passed successfully +++
   

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