diff --git a/.gitignore b/.gitignore index 536013518b..397b2f2bd5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,212 +1,213 @@ # Common \#* .\#* GPATH GRTAGS GTAGS TAGS Makefile Makefile.in .deps .dirstamp .libs *.pc *.pyc *.bz2 *.tar.gz *.rpm *.la *.lo *.o *~ *.gcda *.gcno # Autobuild aclocal.m4 autoconf autoheader autom4te.cache/ automake build.counter compile config.guess config.log config.status config.sub configure depcomp install-sh include/stamp-* libtool libtool.m4 ltdl.m4 libltdl ltmain.sh missing py-compile /m4/argz.m4 /m4/ltargz.m4 /m4/ltoptions.m4 /m4/ltsugar.m4 /m4/ltversion.m4 /m4/lt~obsolete.m4 test-driver ylwrap # Configure targets Doxyfile /cts/CTS.py /cts/CTSlab.py /cts/CTSvars.py /cts/LSBDummy /cts/OCFIPraTest.py /cts/benchmark/clubench /cts/cluster_test /cts/cts /cts/cts-cli /cts/cts-coverage /cts/cts-exec /cts/cts-fencing /cts/cts-log-watcher /cts/cts-regression /cts/cts-scheduler /cts/cts-support /cts/fence_dummy /cts/lxc_autogen.sh /cts/pacemaker-cts-dummyd /cts/pacemaker-cts-dummyd@.service /daemons/execd/pacemaker_remote /daemons/execd/pacemaker_remote.service /daemons/fenced/fence_legacy /daemons/pacemakerd/pacemaker /daemons/pacemakerd/pacemaker.combined.upstart /daemons/pacemakerd/pacemaker.service /daemons/pacemakerd/pacemaker.upstart /extra/logrotate/pacemaker /extra/resources/ClusterMon /extra/resources/HealthSMART /extra/resources/SysInfo /extra/resources/ifspeed /extra/resources/o2cb include/config.h include/config.h.in include/crm_config.h publican.cfg /tools/cibsecret /tools/crm_error /tools/crm_failcount /tools/crm_master /tools/crm_mon.service /tools/crm_mon.upstart /tools/crm_report /tools/crm_standby /tools/report.collector /tools/report.common # Build targets *.7 *.7.xml *.7.html *.8 *.8.xml *.8.html doc/*/en-US/images/*.png doc/*/tmp/** doc/*/publish /daemons/attrd/pacemaker-attrd /daemons/based/pacemaker-based /daemons/based/cibmon /daemons/controld/pacemaker-controld /daemons/execd/cts-exec-helper /daemons/execd/pacemaker-execd /daemons/execd/pacemaker-remoted /daemons/fenced/cts-fence-helper /daemons/fenced/pacemaker-fenced /daemons/fenced/pacemaker-fenced.xml /daemons/pacemakerd/pacemakerd /daemons/schedulerd/pacemaker-schedulerd /daemons/schedulerd/pacemaker-schedulerd.xml /daemons/schedulerd/ptest doc/api/* doc/Clusters_from_Scratch.txt doc/Pacemaker_Explained.txt doc/acls.html doc/crm_fencing.html doc/publican-catalog* scratch /tools/attrd_updater /tools/cibadmin /tools/crmadmin /tools/crm_attribute /tools/crm_diff /tools/crm_mon /tools/crm_node /tools/crm_resource /tools/crm_shadow /tools/crm_simulate /tools/crm_ticket /tools/crm_verify /tools/iso8601 /tools/stonith_admin xml/crm.dtd xml/pacemaker*.rng xml/versions.rng doc/shared/en-US/*.xml doc/Clusters_from_Scratch.build doc/Clusters_from_Scratch/en-US/Ap-*.xml doc/Clusters_from_Scratch/en-US/Ch-*.xml doc/Pacemaker_Administration.build doc/Pacemaker_Administration/en-US/Ch-*.xml doc/Pacemaker_Development.build doc/Pacemaker_Development/en-US/Ch-*.xml doc/Pacemaker_Explained.build doc/Pacemaker_Explained/en-US/Ch-*.xml doc/Pacemaker_Explained/en-US/Ap-*.xml doc/Pacemaker_Remote.build doc/Pacemaker_Remote/en-US/Ch-*.xml lib/gnu/libgnu.a lib/gnu/stdalign.h *.coverity # Test detritus /cts/.regression.failed.diff /cts/scheduler/*.ref /cts/scheduler/*.up /cts/scheduler/*.up.err /cts/scheduler/bug-rh-1097457.log /cts/scheduler/bug-rh-1097457.trs /cts/scheduler/shadow.* /cts/test-suite.log /xml/test-2/*.up /xml/test-2/*.up.err +/xml/assets/diffview.js # Formerly built files (helps when jumping back and forth in checkout) /attrd /cib /coverage.sh /crmd /cts/HBDummy /fencing /lrmd /mcp /pengine #Other mock HTML pacemaker*.spec coverity-* compat_reports .ABI-build abi_dumps logs *.patch *.diff *.sed *.orig *.rej *.swp diff --git a/xml/assets/upgrade-2.10-htmldiff.xsl b/xml/assets/upgrade-2.10-htmldiff.xsl new file mode 100644 index 0000000000..22922904c6 --- /dev/null +++ b/xml/assets/upgrade-2.10-htmldiff.xsl @@ -0,0 +1,351 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <xsl:text>upgrade-2.10 on-the-fly in-browser transformation</xsl:text> + + + + + + +

test

+

+ Using upgrade-2.10 on-the-fly in-browser transformation + + [ + previous + and + next, or use arrows + ] + +

+

+ Differences highlight view to be loaded here. +

+

Diagnostics

+

+ Open JS console + (e.g. Ctrl + Shift + J, focusing JS + log combo) + + to check the actual messages from the in-browser transformation match the baseline: + +

+ 
+        Expected diagnostic messages to be loaded here.
+
+

Debugging

+

+ These are raw data (beware, already chewed with the + view-source + transformation, hence not very suitable for copying) entering + the differential generating processs: +

+

+ + original+ + original- + +
+ 

+          
+
+

+

+ + transformed+ + transformed- + +
+ 

+          
+
+

+
+

+ This generated page is based on the externally provided pacemaker XML + configuration file (CIB), @basename@, which is + the primary object of interest here. + But the rendered page wouldn't be possible without the actual + transformations and other auxiliary files that come with these notices: +
+

+

+ + + + + diff --git a/xml/assets/view-source-library.xsl b/xml/assets/view-source-library.xsl new file mode 100644 index 0000000000..8ac0dc2fa7 --- /dev/null +++ b/xml/assets/view-source-library.xsl @@ -0,0 +1,222 @@ + + + + + + + http://www.w3.org/XML/1998/namespace + http://www.w3.org/2000/xmlns/ + http://www.w3.org/1999/xhtml + http://www.w3.org/2000/svg + http://www.w3.org/1998/Math/MathML + http://www.w3.org/1999/XSL/Transform + http://www.w3.org/1999/XSL/Format + http://www.w3.org/2005/SMIL21/Language + http://www.w3.org/1999/xlink + http://www.w3.org/2001/XMLSchema + http://www.w3.org/2001/XMLSchema-instance + http://www.w3.org/2001/xforms + http://www.w3.org/2001/XInclude + http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul + http://www.w3.org/1999/02/22-rdf-syntax-ns# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + : + + + + + + + + + + + + + + + + + highlight + + + + + + + + + + + + diff --git a/xml/assets/view-source-original.xsl b/xml/assets/view-source-original.xsl new file mode 100644 index 0000000000..327e0d38bc --- /dev/null +++ b/xml/assets/view-source-original.xsl @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + < + + + + + > + + + + </ + + > + + + + + + + < + + + + + /> + + + + + + + + + + + + + + + =" + + + + " + + + + + + + <? + + + + ?> + + + + + + + <!-- + + + + --> + + + + + + + + + + + + + diff --git a/xml/regression.sh b/xml/regression.sh index 3679b2c37c..c3bce333c2 100755 --- a/xml/regression.sh +++ b/xml/regression.sh @@ -1,570 +1,640 @@ #!/bin/sh # Copyright 2018 Red Hat, Inc. # Author: Jan Pokorny # Part of pacemaker project # SPDX-License-Identifier: GPL-2.0-or-later set -eu +test -d assets && test -d test-2 \ + || { echo 'Run me from source-tree-like location'; exit 1; } # $1=reference (can be '-' for stdin), $2=investigated # alt.: wdiff, colordiff, ... DIFF=${DIFF:-diff} DIFFOPTS=${DIFFOPTS--u} DIFFPAGER=${DIFFPAGER:-less -LRX} # $1=schema, $2=validated # alt.: jing -i RNGVALIDATOR=${RNGVALIDATOR:-xmllint --noout --relaxng} # $1=stylesheet, $2=source -# alt.: Xalan, saxon (note: only validates reliably with -B) +# alt.: Xalan, saxon, sabcmd/Sablotron (note: only validates reliably with -B) _xalan_wrapper() { - { Xalan "$2" "$1" 2>&1 >&3 \ + { ${_XSLTPROCESSOR} "$2" "$1" 2>&1 >&3 \ | sed -e '/^Source tree node.*$/d' \ -e 's|^XSLT message: \(.*\) (Occurred.*)|\1|'; } 3>&- 3>&1 >&2 } +# Sablotron doesn't translate '-' file specification to stdin +# and limits the length of the output message +_sabcmd_wrapper() { + _sabw_sheet=${1:?} + _sabw_source=${2:?} + test "${_sabw_sheet}" != - || _sabw_sheet=/dev/stdin + test "${_sabw_source}" != - || _sabw_source=/dev/stdin + { ${_XSLTPROCESSOR} "${_sabw_sheet}" "${_sabw_source}" 2>&1 >&3 \ + | sed -e '/^Warning \[code:89\]/d' \ + -e 's|^ xsl:message (\(.*\))$|\1|'; } 3>&- 3>&1 >&2 +} # filtered out message: https://bugzilla.redhat.com/show_bug.cgi?id=1577367 _saxon_wrapper() { - { saxon "-xsl:$1" "-s:$2" -versionmsg:off 2>&1 >&3 \ + { ${_XSLTPROCESSOR} "-xsl:$1" "-s:$2" -versionmsg:off 2>&1 >&3 \ | sed -e '/^Cannot find CatalogManager.properties$/d'; } 3>&- 3>&1 >&2 } -XSLTPROCESSOR=${XSLTPROCESSOR:-xsltproc} -test "${XSLTPROCESSOR}" != Xalan || XSLTPROCESSOR=_xalan_wrapper -test "${XSLTPROCESSOR}" != saxon || XSLTPROCESSOR=_saxon_wrapper +XSLTPROCESSOR=${XSLTPROCESSOR:-xsltproc --nonet} +_XSLTPROCESSOR=${XSLTPROCESSOR} +case "${XSLTPROCESSOR}" in +[Xx]alan*|*/[Xx]alan*) XSLTPROCESSOR=_xalan_wrapper;; +sabcmd*|*/sabcmd*) XSLTPROCESSOR=_sabcmd_wrapper;; +saxon*|*/saxon*) XSLTPROCESSOR=_saxon_wrapper;; +esac +HTTPPORT=${HTTPPORT:-8000} # Python's default +WEBBROWSER=${WEBBROWSER:-firefox} tests= # test* names (should go first) here will become preselected default # # commons # emit_result() { _er_howmany=${1:?} # how many errors (0/anything else incl. strings) _er_subject=${2:?} _er_prefix=${3-} test -z "${_er_prefix}" || _er_prefix="${_er_prefix}: " if test "${_er_howmany}" = 0; then printf "%s%s finished OK\n" "${_er_prefix}" "${_er_subject}" else printf "%s%s encountered ${_er_howmany} errors\n" \ "${_er_prefix}" "${_er_subject}" fi } emit_error() { _ee_msg=${1:?} printf "%s\n" "${_ee_msg}" >&2 } # returns 1 + floor of base 2 logaritm for _lo0r_i in 1...255, # or 0 for _lo0r_i = 0 log2_or_0_return() { _lo0r_i=${1:?} return $(((!(_lo0r_i >> 1) && _lo0r_i) * 1 \ + (!(_lo0r_i >> 2) && _lo0r_i & (1 << 1)) * 2 \ + (!(_lo0r_i >> 3) && _lo0r_i & (1 << 2)) * 3 \ + (!(_lo0r_i >> 4) && _lo0r_i & (1 << 3)) * 4 \ + (!(_lo0r_i >> 5) && _lo0r_i & (1 << 4)) * 5 \ + (!(_lo0r_i >> 6) && _lo0r_i & (1 << 5)) * 6 \ + (!(_lo0r_i >> 7) && _lo0r_i & (1 << 6)) * 7 \ + !!(_lo0r_i >> 7) * 7 )) } # rough addition of two base 2 logarithms log2_or_0_add() { _lo0a_op1=${1:?} _lo0a_op2=${2:?} if test ${_lo0a_op1} -gt ${_lo0a_op2}; then return ${_lo0a_op1} elif test ${_lo0a_op2} -gt ${_lo0a_op1}; then return ${_lo0a_op2} elif test ${_lo0a_op1} -gt 0; then return $((_lo0a_op1 + 1)) else return ${_lo0a_op1} fi } # # test phases # +# stdin: input file per line +test_browser() { + _tb_cleanref=0 + _tb_serverpid= + + if ! read _tb_first; then + return 1 + fi + cat >/dev/null 2>/dev/null # read out the rest + + test -f assets/diffview.js \ + || curl -Lo assets/diffview.js \ + 'https://raw.githubusercontent.com/prettydiff/prettydiff/2.2.8/lib/diffview.js' + + { which python3 >/dev/null 2>/dev/null \ + && { python3 -m http.server "${HTTPPORT}" -b 127.0.0.1 \ + || emit_error "Python3 HTTP server fail"; return; } \ + || which python2 >/dev/null 2>/dev/null \ + && { printf '%s %s\n' \ + 'Python 2 backed HTTP server cannot listen at particular' \ + 'address, discretion regarding firewall rules recommended!' + python2 -m SimpleHTTPServer "${HTTPPORT}" \ + || emit_error 'Python2 HTTP server fail'; return; } \ + || emit_error 'Cannot run Python based HTTP server' ; } & + _tb_serverpid=$! + ${WEBBROWSER} "http://localhost:${HTTPPORT}/${_tb_first}" & + printf "When finished, just press Ctrl+C or kill %d, please\n" \ + "${_tb_serverpid}" + wait +} + # -r ... whether to remove referential files as well # stdin: input file per line test_cleaner() { _tc_cleanref=0 while test $# -gt 0; do case "$1" in -r) _tc_cleanref=1;; esac shift done while read _tc_origin; do _tc_origin=${_tc_origin%.*} rm -f "${_tc_origin}.up" "${_tc_origin}.up.err" rm -f "$(dirname "${_tc_origin}")/.$(basename "${_tc_origin}").up" test ${_tc_cleanref} -eq 0 \ || rm -f "${_tc_origin}.ref" "${_tc_origin}.ref.err" done } test_selfcheck() { + _tsc_ret=0 _tsc_template= _tsc_validator= while test $# -gt 0; do case "$1" in -o=*) _tsc_template="${1#-o=}";; esac shift done _tsc_validator="${_tsc_template:?}" _tsc_validator="cibtr-${_tsc_validator%%.*}.rng" _tsc_template="upgrade-${_tsc_template}.xsl" # check schema (sub-grammar) for custom transformation mapping alone - ${RNGVALIDATOR} 'http://relaxng.org/relaxng.rng' "${_tsc_validator}" + if ! ${RNGVALIDATOR} 'http://relaxng.org/relaxng.rng' "${_tsc_validator}"; then + _tsc_ret=$((_tsc_ret + 1)) + fi # check the overall XSLT per the main grammar + said sub-grammar - ${RNGVALIDATOR} "xslt_${_tsc_validator}" "${_tsc_template}" + if ! ${RNGVALIDATOR} "xslt_${_tsc_validator}" "${_tsc_template}"; then + _tsc_ret=$((_tsc_ret + 1)) + fi + + log2_or_0_return ${_tsc_ret} } test_explanation() { _tsc_template= while test $# -gt 0; do case "$1" in -o=*) _tsc_template="upgrade-${1#-o=}.xsl";; esac shift done ${XSLTPROCESSOR} upgrade-detail.xsl "${_tsc_template}" } # stdout: filename of the transformed file test_runner_upgrade() { _tru_template=${1:?} _tru_source=${2:?} # filename _tru_mode=${3:?} # extra modes wrt. "referential" outcome, see below _tru_ref="${_tru_source%.*}.ref" { test "$((_tru_mode & (1 << 0)))" -ne 0 \ || test -f "${_tru_ref}.err"; } \ && _tru_ref_err="${_tru_ref}.err" || _tru_ref_err=/dev/null _tru_target="${_tru_source%.*}.up" _tru_target_err="${_tru_target}.err" if test $((_tru_mode & (1 << 2))) -eq 0; then ${XSLTPROCESSOR} "${_tru_template}" "${_tru_source}" \ > "${_tru_target}" 2> "${_tru_target_err}" \ || { _tru_ref=$?; echo "${_tru_target_err}" return ${_tru_ref}; } else # when -B (deblanked outcomes handling) requested, we: # - drop blanks from the source XML # (effectively emulating pacemaker handling) # - re-drop blanks from the XSLT outcome, # which is compared with referential outcome # processed with even greedier custom deblanking # (extraneous inter-element whitespace like blank # lines will not get removed otherwise, see lower) xmllint --noblanks "${_tru_source}" \ | ${XSLTPROCESSOR} "${_tru_template}" - \ > "${_tru_target}" 2> "${_tru_target_err}" \ || { _tru_ref=$?; echo "${_tru_target_err}" return ${_tru_ref}; } # reusing variable no longer needed _tru_template="$(dirname "${_tru_target}")" _tru_template="${_tru_template}/.$(basename "${_tru_target}")" mv "${_tru_target}" "${_tru_template}" ${XSLTPROCESSOR} - "${_tru_template}" > "${_tru_target}" <<-EOF EOF fi # only respond with the flags except for "-B", i.e., when both: # - _tru_mode non-zero # - "-B" in _tru_mode is zero (hence non-zero when flipped with XOR) if test "$((_tru_mode * ((_tru_mode ^ (1 << 2)) & (1 << 2))))" -ne 0; then if test $((_tru_mode & (1 << 0))) -ne 0; then cp -a "${_tru_target}" "${_tru_ref}" cp -a "${_tru_target_err}" "${_tru_ref_err}" fi if test $((_tru_mode & (1 << 1))) -ne 0; then "${DIFF}" ${DIFFOPTS} "${_tru_source}" "${_tru_ref}" \ | ${DIFFPAGER} >&2 if test $? -ne 0; then printf "\npager failure\n" >&2 return 1 fi printf '\nIs comparison OK? ' >&2 if read _tru_answer &2; return 1;; esac else return 1 fi fi elif test -f "${_tru_ref}" && test -e "${_tru_ref_err}"; then { test "$((_tru_mode & (1 << 2)))" -eq 0 && cat "${_tru_ref}" \ || ${XSLTPROCESSOR} - "${_tru_ref}" <<-EOF EOF } \ | "${DIFF}" ${DIFFOPTS} - "${_tru_target}" >&2 \ && "${DIFF}" ${DIFFOPTS} "${_tru_ref_err}" \ "${_tru_target_err}" >&2 if test $? -ne 0; then emit_error "Outputs differ from referential ones" echo "/dev/null" return 1 fi else emit_error "Referential file(s) missing: ${_tru_ref}" echo "/dev/null" return 1 fi echo "${_tru_target}" } test_runner_validate() { _trv_schema=${1:?} _trv_target=${2:?} # filename if ! ${RNGVALIDATOR} "${_trv_schema}" "${_trv_target}" \ 2>/dev/null; then ${RNGVALIDATOR} "${_trv_schema}" "${_trv_target}" fi } # -o= ... which conventional version to deem as the transform origin # -t= ... which conventional version to deem as the transform target # -B # -D -# -G ... see usage +# -G ... see usage # stdin: input file per line test_runner() { _tr_mode=0 _tr_ret=0 _tr_schema_o= _tr_schema_t= _tr_target= _tr_template= while test $# -gt 0; do case "$1" in -o=*) _tr_template="upgrade-${1#-o=}.xsl" _tr_schema_o="pacemaker-${1#-o=}.rng";; -t=*) _tr_schema_t="pacemaker-${1#-t=}.rng";; -G) _tr_mode=$((_tr_mode | (1 << 0)));; -D) _tr_mode=$((_tr_mode | (1 << 1)));; -B) _tr_mode=$((_tr_mode | (1 << 2)));; esac shift done if ! test -f "${_tr_schema_o:?}" || ! test -f "${_tr_schema_t:?}"; then emit_error "Origin and/or target schema missing, rerun make" return 1 fi while read _tr_origin; do printf '%-60s' "${_tr_origin}... " # pre-validate if ! test_runner_validate "${_tr_schema_o}" "${_tr_origin}"; then _tr_ret=$((_tr_ret + 1)); echo "E:pre-validate"; continue fi # upgrade if ! _tr_target=$(test_runner_upgrade "${_tr_template}" \ "${_tr_origin}" "${_tr_mode}"); then _tr_ret=$((_tr_ret + 1)); test -n "${_tr_target}" || break echo "E:upgrade" test -s "${_tr_target}" \ && { echo ---; cat "${_tr_target}" || :; echo ---; } continue fi # post-validate if ! test_runner_validate "${_tr_schema_t}" "${_tr_target}"; then _tr_ret=$((_tr_ret + 1)); echo "E:post-validate"; continue fi echo "OK" done log2_or_0_return ${_tr_ret} } # # particular test variations # stdin: granular test specification(s) if any # test2to3() { _t23_pattern= while read _t23_spec; do _t23_spec=${_t23_spec%.xml} _t23_spec=${_t23_spec%\*} _t23_pattern="${_t23_pattern} -name ${_t23_spec}*.xml -o" done test -z "${_t23_pattern}" || _t23_pattern="( ${_t23_pattern%-o} )" find test-2 -name test-2 -o -type d -prune \ -o -name '*.xml' ${_t23_pattern} -print | env LC_ALL=C sort \ | { case " $* " in *\ -C\ *) test_cleaner;; *\ -S\ *) test_selfcheck -o=2.10;; *\ -X\ *) test_explanation -o=2.10;; + *\ -W\ *) test_browser;; *) test_runner -o=2.10 -t=3.0 "$@" || return $?;; esac; } } tests="${tests} test2to3" # -B # -D -# -G ... see usage +# -G ... see usage cts_scheduler() { _tcp_mode=0 _tcp_ret=0 _tcp_validatewith= _tcp_schema_o= _tcp_schema_t= _tcp_template= find ../cts/scheduler -name scheduler -o -type d -prune \ -o -name '*.xml' -print | env LC_ALL=C sort \ | { case " $* " in *\ -C\ *) test_cleaner -r;; *\ -S\ *) emit_result "not implemented" "option -S";; *\ -X\ *) emit_result "not implemented" "option -X";; *) while test $# -gt 0; do case "$1" in -G) _tcp_mode=$((_tcp_mode | (1 << 0)));; -D) _tcp_mode=$((_tcp_mode | (1 << 1)));; -B) _tcp_mode=$((_tcp_mode | (1 << 2)));; esac shift done while read _tcp_origin; do _tcp_validatewith=$(${XSLTPROCESSOR} - "${_tcp_origin}" <<-EOF EOF ) _tcp_schema_t=${_tcp_validatewith} case "${_tcp_validatewith}" in 1) _tcp_schema_o=1.3;; 2) _tcp_schema_o=2.10;; # only for gradual refinement as upgrade-2.10.xsl under # active development, move to 3.x when schema v4 emerges 3) _tcp_schema_o=2.10 _tcp_schema_t=2;; *) emit_error \ "need to skip ${_tcp_origin} (schema: ${_tcp_validatewith})" continue;; esac _tcp_template="upgrade-${_tcp_schema_o}.xsl" _tcp_schema_t="pacemaker-$((_tcp_schema_t + 1)).0.rng" test "${_tcp_schema_o%%.*}" = "${_tcp_validatewith}" \ && _tcp_schema_o="pacemaker-${_tcp_schema_o}.rng" \ || _tcp_schema_o="${_tcp_schema_t}" # pre-validate if test "${_tcp_schema_o}" != "${_tcp_schema_t}" \ && ! test_runner_validate "${_tcp_schema_o}" "${_tcp_origin}"; then _tcp_ret=$((_tcp_ret + 1)); echo "E:pre-validate"; continue fi # upgrade test "$((_tcp_mode & (1 << 0)))" -ne 0 \ || ln -fs "$(pwd)/${_tcp_origin}" "${_tcp_origin%.*}.ref" if ! _tcp_target=$(test_runner_upgrade "${_tcp_template}" \ "${_tcp_origin}" "${_tcp_mode}"); then _tcp_ret=$((_tcp_ret + 1)); test -n "${_tcp_target}" || break echo "E:upgrade" test -s "${_tcp_target}" \ && { echo ---; cat "${_tcp_target}" || :; echo ---; } continue fi test "$((_tcp_mode & (1 << 0)))" -ne 0 \ || rm -f "${_tcp_origin%.*}.ref" # post-validate if ! test_runner_validate "${_tcp_schema_t}" "${_tcp_target}"; then _tcp_ret=$((_tcp_ret + 1)); echo "E:post-validate"; continue fi test "$((_tcp_mode & (1 << 0)))" -eq 0 \ || mv "${_tcp_target}" "${_tcp_origin}" done; log2_or_0_return ${_tcp_ret};; esac; } } tests="${tests} cts_scheduler" # # "framework" # # option-likes ... options to be passed down # argument-likes ... drives a test selection test_suite() { _ts_pass= _ts_select= _ts_select_full= _ts_test_specs= _ts_global_ret=0 _ts_ret=0 while test $# -gt 0; do case "$1" in -) printf '%s\n' 'waiting for tests specified at stdin...'; while read _ts_spec; do _ts_select="${_ts_spec}@$1"; done;; -*) _ts_pass="${_ts_pass} $1";; *) _ts_select_full="${_ts_select_full}@$1" _ts_select="${_ts_select}@${1%%/*}";; esac shift done _ts_select="${_ts_select}@" _ts_select_full="${_ts_select_full}@" for _ts_test in ${tests}; do while true; do case "${_ts_select}" in *@${_ts_test}@*) _ts_select="${_ts_select%@${_ts_test}@*}"\ "@${_ts_select#*@${_ts_test}@}" break ;; @) case "${_ts_test}" in test*) break;; esac ;; esac continue 2 # move on to matching with next local test done _ts_test_specs= while true; do case "${_ts_select_full}" in *@${_ts_test}/*) _ts_test_full="${_ts_test}/${_ts_select_full#*@${_ts_test}/}" _ts_test_full="${_ts_test_full%%@*}" _ts_select_full="${_ts_select_full%@${_ts_test_full}@*}"\ "@${_ts_select_full#*@${_ts_test_full}@}" _ts_test_specs="${_ts_test_specs} ${_ts_test_full#*/}" ;; *) break ;; esac done for _ts_test_spec in ${_ts_test_specs}; do printf '%s\n' "${_ts_test_spec}" done | "${_ts_test}" ${_ts_pass} || _ts_ret=$? test ${_ts_ret} = 0 \ && emit_result ${_ts_ret} "${_ts_test}" \ || emit_result "at least 2^$((_ts_ret - 1))" "${_ts_test}" log2_or_0_add ${_ts_global_ret} ${_ts_ret} _ts_global_ret=$? done if test "${_ts_select}" != @; then emit_error "Non-existing test(s):$(echo "${_ts_select}" \ | tr '@' ' ')" log2_or_0_add ${_ts_global_ret} 1 || _ts_global_ret=$? fi return ${_ts_global_ret} } # NOTE: big letters are dedicated for per-test-set behaviour, # small ones for generic/global behaviour usage() { - printf '%s\n %s\n %s\n %s\n %s\n %s\n %s\n %s\n %s\n %s\n' \ - "usage: $0 [-{B,C,D,G,S,X}]* [-|{${tests## }}*]" \ - "- when no suites (arguments) provided, \"test*\" ones get used" \ - "- with '-' suite specification the actual ones grabbed on stdin" \ - "- use '-B' to run validate-only check suppressing blanks first" \ - "- use '-C' to only cleanup ephemeral byproducts" \ - "- use '-D' to review originals vs. \"referential\" outcomes" \ - "- use '-G' to generate \"referential\" outcomes" \ - "- use '-S' for template self-check (requires net access)" \ - "- use '-X' to show explanatory details about the upgrade" \ - "- test specification can be granular, e.g. 'test2to3/022'" + printf \ + '%s\n %s\n %s\n %s\n %s\n %s\n %s\n %s\n %s\n %s\n %s\n' \ + "usage: $0 [-{B,C,D,G,S,X}]* [-|{${tests## }}*]" \ + "- when no suites (arguments) provided, \"test*\" ones get used" \ + "- with '-' suite specification the actual ones grabbed on stdin" \ + "- use '-B' to run validate-only check suppressing blanks first" \ + "- use '-C' to only cleanup ephemeral byproducts" \ + "- use '-D' to review originals vs. \"referential\" outcomes" \ + "- use '-G' to generate \"referential\" outcomes" \ + "- use '-S' for template self-check (requires net access)" \ + "- use '-W' to run browser-based, on-the-fly diff'ing test drive" \ + "- use '-X' to show explanatory details about the upgrade" \ + "- test specification can be granular, e.g. 'test2to3/022'" + printf \ + '\n%s\n %s\n %s\n %s\n %s\n %s\n %s\n %s\n' \ + 'environment variables affecting the run + default/current values:' \ + "- DIFF (${DIFF}): tool to compute and show differences of 2 files" \ + "- DIFFOPTS (${DIFFOPTS}): options to the above tool" \ + "- DIFFPAGER (${DIFFPAGER}): possibly accompanying the above tool" \ + "- RNGVALIDATOR (${RNGVALIDATOR}): RelaxNG validator" \ + "- XSLTPROCESSOR (${_XSLTPROCESSOR}): XSLT 1.0 capable processor" \ + "- HTTPPORT (${HTTPPORT}): port used by test drive HTTP server run" \ + "- WEBBROWSER (${WEBBROWSER}): used for in-browser test drive" } main() { _main_pass= _main_bailout=0 _main_ret=0 while test $# -gt 0; do case "$1" in -h) usage; exit;; -C|-G|-S|-X) _main_bailout=1;; esac _main_pass="${_main_pass} $1" shift done test_suite ${_main_pass} || _main_ret=$? test ${_main_bailout} -eq 1 && return ${_main_ret} \ || test_suite -C ${_main_pass} >/dev/null || true test ${_main_ret} = 0 && emit_result ${_main_ret} "Overall suite" \ || emit_result "at least 2^$((_main_ret - 1))" "Overall suite" return ${_main_ret} } main "$@" diff --git a/xml/test-2/010-rsc_colocation-dropped-for-noop-sa.xml b/xml/test-2/010-rsc_colocation-dropped-for-noop-sa.xml index 699d3d0bd8..70bedfdad3 100644 --- a/xml/test-2/010-rsc_colocation-dropped-for-noop-sa.xml +++ b/xml/test-2/010-rsc_colocation-dropped-for-noop-sa.xml @@ -1,61 +1,62 @@ + diff --git a/xml/test-2/020-rsc-requires-inline.xml b/xml/test-2/020-rsc-requires-inline.xml index 66b1d0604c..630bb18bd7 100644 --- a/xml/test-2/020-rsc-requires-inline.xml +++ b/xml/test-2/020-rsc-requires-inline.xml @@ -1,44 +1,45 @@ + diff --git a/xml/test-2/021-rsc-requires-nvpair.xml b/xml/test-2/021-rsc-requires-nvpair.xml index e2214efe40..6f75c200e5 100644 --- a/xml/test-2/021-rsc-requires-nvpair.xml +++ b/xml/test-2/021-rsc-requires-nvpair.xml @@ -1,47 +1,48 @@ + diff --git a/xml/test-2/022-rsc-requires-counterexamples.xml b/xml/test-2/022-rsc-requires-counterexamples.xml index c74e76cdd4..ce9717b31d 100644 --- a/xml/test-2/022-rsc-requires-counterexamples.xml +++ b/xml/test-2/022-rsc-requires-counterexamples.xml @@ -1,49 +1,50 @@ + diff --git a/xml/test-2/023-rsc-requires-no-override.xml b/xml/test-2/023-rsc-requires-no-override.xml index 5de3efebf1..8f3d765ef1 100644 --- a/xml/test-2/023-rsc-requires-no-override.xml +++ b/xml/test-2/023-rsc-requires-no-override.xml @@ -1,65 +1,66 @@ + diff --git a/xml/test-2/024-rsc-requires-no-selfclash.xml b/xml/test-2/024-rsc-requires-no-selfclash.xml index f44737e2d4..096c61c2a6 100644 --- a/xml/test-2/024-rsc-requires-no-selfclash.xml +++ b/xml/test-2/024-rsc-requires-no-selfclash.xml @@ -1,140 +1,141 @@ + diff --git a/xml/test-2/030-clu-props-plain-rename.xml b/xml/test-2/030-clu-props-plain-rename.xml index 8186117d20..f7a0a52d8a 100644 --- a/xml/test-2/030-clu-props-plain-rename.xml +++ b/xml/test-2/030-clu-props-plain-rename.xml @@ -1,25 +1,26 @@ + diff --git a/xml/test-2/031-clu-props-drop.xml b/xml/test-2/031-clu-props-drop.xml index 9d33788a1c..663569c398 100644 --- a/xml/test-2/031-clu-props-drop.xml +++ b/xml/test-2/031-clu-props-drop.xml @@ -1,20 +1,21 @@ + diff --git a/xml/test-2/032-clu-props-move.xml b/xml/test-2/032-clu-props-move.xml index aff84ebafb..1f34d7b814 100644 --- a/xml/test-2/032-clu-props-move.xml +++ b/xml/test-2/032-clu-props-move.xml @@ -1,15 +1,16 @@ + diff --git a/xml/test-2/033-clu-props-move-merge.xml b/xml/test-2/033-clu-props-move-merge.xml index a5d681906e..c34085b15e 100644 --- a/xml/test-2/033-clu-props-move-merge.xml +++ b/xml/test-2/033-clu-props-move-merge.xml @@ -1,20 +1,21 @@ + diff --git a/xml/test-2/034-clu-props-move-redef.xml b/xml/test-2/034-clu-props-move-redef.xml index 7f65755a78..fcadf20a7a 100644 --- a/xml/test-2/034-clu-props-move-redef.xml +++ b/xml/test-2/034-clu-props-move-redef.xml @@ -1,14 +1,15 @@ + diff --git a/xml/test-2/040-nodes-rename-type.xml b/xml/test-2/040-nodes-rename-type.xml index fe19d91b84..939b768c8d 100644 --- a/xml/test-2/040-nodes-rename-type.xml +++ b/xml/test-2/040-nodes-rename-type.xml @@ -1,15 +1,16 @@ + diff --git a/xml/test-2/050-rsc-attrs-instance-plain-rename.xml b/xml/test-2/050-rsc-attrs-instance-plain-rename.xml index 02db4cd556..ccf2404130 100644 --- a/xml/test-2/050-rsc-attrs-instance-plain-rename.xml +++ b/xml/test-2/050-rsc-attrs-instance-plain-rename.xml @@ -1,24 +1,25 @@ + diff --git a/xml/test-2/051-rsc-attrs-instance-pcmk_arg_map.xml b/xml/test-2/051-rsc-attrs-instance-pcmk_arg_map.xml index 01a2782db9..75ad2a7485 100644 --- a/xml/test-2/051-rsc-attrs-instance-pcmk_arg_map.xml +++ b/xml/test-2/051-rsc-attrs-instance-pcmk_arg_map.xml @@ -1,50 +1,51 @@ + diff --git a/xml/test-2/060-rsc-attrs-meta-isolation.xml b/xml/test-2/060-rsc-attrs-meta-isolation.xml index 3f49b2a442..9c7dcb9e88 100644 --- a/xml/test-2/060-rsc-attrs-meta-isolation.xml +++ b/xml/test-2/060-rsc-attrs-meta-isolation.xml @@ -1,26 +1,27 @@ + diff --git a/xml/test-2/061-rsc-attrs-meta-exchange.xml b/xml/test-2/061-rsc-attrs-meta-exchange.xml index 99ff8559b0..cb0c0ebcb9 100644 --- a/xml/test-2/061-rsc-attrs-meta-exchange.xml +++ b/xml/test-2/061-rsc-attrs-meta-exchange.xml @@ -1,29 +1,30 @@ + diff --git a/xml/test-2/070-rsc-op-attrs-inst-requires-start.xml b/xml/test-2/070-rsc-op-attrs-inst-requires-start.xml index 90a4735a5f..2661f7d0a6 100644 --- a/xml/test-2/070-rsc-op-attrs-inst-requires-start.xml +++ b/xml/test-2/070-rsc-op-attrs-inst-requires-start.xml @@ -1,48 +1,49 @@ + diff --git a/xml/test-2/071-rsc-op-attrs-inst-requires-nonstart.xml b/xml/test-2/071-rsc-op-attrs-inst-requires-nonstart.xml index b6f87bfc2f..4f364f469d 100644 --- a/xml/test-2/071-rsc-op-attrs-inst-requires-nonstart.xml +++ b/xml/test-2/071-rsc-op-attrs-inst-requires-nonstart.xml @@ -1,48 +1,49 @@ + diff --git a/xml/test-2/072-rsc-op-attrs-inst-requires-no-override.xml b/xml/test-2/072-rsc-op-attrs-inst-requires-no-override.xml index c7359424bc..8af4bf12f1 100644 --- a/xml/test-2/072-rsc-op-attrs-inst-requires-no-override.xml +++ b/xml/test-2/072-rsc-op-attrs-inst-requires-no-override.xml @@ -1,60 +1,61 @@ + diff --git a/xml/test-2/073-rsc-op-attrs-inst-meta-meaning.xml b/xml/test-2/073-rsc-op-attrs-inst-meta-meaning.xml index 736d54669f..1a1f73f712 100644 --- a/xml/test-2/073-rsc-op-attrs-inst-meta-meaning.xml +++ b/xml/test-2/073-rsc-op-attrs-inst-meta-meaning.xml @@ -1,49 +1,50 @@ + diff --git a/xml/upgrade-2.10.xsl b/xml/upgrade-2.10.xsl index 03ea60d812..321b3c22ba 100644 --- a/xml/upgrade-2.10.xsl +++ b/xml/upgrade-2.10.xsl @@ -1,2488 +1,2532 @@ - + - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + + ]" + mode="cibtr:main"/> - + ]" + mode="cibtr:main"/> + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - + - + - + - + - + + ]" + mode="cibtr:main"/> - + ]" + mode="cibtr:main"/> + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + + + + + + + + + diff --git a/xml/upgrade-detail.xsl b/xml/upgrade-detail.xsl index 8907618d15..da85116193 100644 --- a/xml/upgrade-detail.xsl +++ b/xml/upgrade-detail.xsl @@ -1,129 +1,129 @@ - + - +