pegasus/test/config.mak - diff

Return to config.mak CVS log

Up to [Pegasus] / pegasus / test

Diff for /pegasus/test/config.mak between version 1.18 and 1.23

version 1.18, 2008/12/02 09:03:07

version 1.23, 2012/09/13 14:31:30

Line 42

XMLREQUESTS_DS = $(foreach i, $(XMLSCRIPTS_DS), $i.xml)

XMLRESPONSES_DS = $(XMLREQUESTS_DS:.xml=.rsp_ds)

XMLREQUESTS_STRIPPED = $(foreach i, $(XMLSCRIPTS_STRIPPED), $i.xml)

XMLRESPONSES_STRIPPED = $(XMLREQUESTS_STRIPPED:.xml=.rsp_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)

XMLRESPONSES_DS_STRIPPED = $(XMLREQUESTS_DS_STRIPPED:.xml=.rsp_ds_stripped)

XMLGOODRESPONSE_DS_STRIPPED = $(XMLREQUESTS_DS_STRIPPED:.xml=rspgood.xml.stripped)

WBEMEXECOPTIONS = $(HOSTNAME) $(PORT) $(HTTPMETHOD) $(HTTPVERSION) $(USER) $(PASSWORD) $(SSL)

Line 59

Line 76

@ $(RM) $(TMP_DIR)/$*.rsp_ds

@ $(ECHO) +++ $* passed successfully +++

%.rsp_stripped: %.xml

@ wbemexec $(WBEMEXECOPTIONS) $*.xml > $(TMP_DIR)/$*.rsp_stripped || cd .

@ $(COPY) $*rspgood.xml $(TMP_DIR)/$*rspgood.xml.stripped

@ $(STRIPL) $(STRIPLINES) $(TMP_DIR)/$*.rsp_stripped

@ $(STRIPL) $(STRIPLINES) $(TMP_DIR)/$*rspgood.xml.stripped

@ $(DIFF) $(TMP_DIR)/$*rspgood.xml.stripped $(TMP_DIR)/$*.rsp_stripped

@ $(RM) $(TMP_DIR)/$*.rsp_stripped

@ $(RM) $(TMP_DIR)/$*rspgood.xml.stripped

@ $(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

@ wbemexec $(WBEMEXECOPTIONS) $*.xml > $(TMP_DIR)/$*.rsp_ds_stripped || cd .

@ $(COPY) $*rspgood.xml $(TMP_DIR)/$*rspgood.xml.stripped

@ $(STRIPL) $(STRIPLINES_DS) $(TMP_DIR)/$*.rsp_ds_stripped

@ $(STRIPL) $(STRIPLINES_DS) $(TMP_DIR)/$*rspgood.xml.stripped

@ $(call DIFFSORT,$(TMP_DIR)/$*rspgood.xml.stripped,$(TMP_DIR)/$*.rsp_ds_stripped)

@ $(RM) $(TMP_DIR)/$*.rsp_ds_stripped

@ $(RM) $(TMP_DIR)/$*rspgood.xml.stripped

@ $(ECHO) +++ $* passed successfully +++

Legend:

Removed from v.1.18
changed lines
	Added in v.1.23

No CVS admin address has been configured