Merge pull request #1472 from jnpkrn/upgrade-xsl-2to3-part3

Upgrade xsl 2to3 part3
ClusterLabs · Apr 30, 2018 · b12c320 · b12c320
2 parents a34ccd9 + 224e03b
commit b12c320
Show file tree

Hide file tree

Showing 5 changed files with 261 additions and 170 deletions.
diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
@@ -6,7 +6,7 @@
 #
 include $(top_srcdir)/Makefile.common
 
-AM_CPPFLAGS		+= -I$(top_builddir)/lib/gnu -I$(top_srcdir)/lib/gnu
+AM_CPPFLAGS		+= -I$(top_builddir)/lib/gnu -I$(top_srcdir)/lib/gnu -DPCMK_SCHEMAS_EMERGENCY_XSLT=0
 
 ## libraries
 lib_LTLIBRARIES	= libcrmcommon.la

diff --git a/xml/regression.sh b/xml/regression.sh
@@ -178,7 +178,10 @@ test_runner_upgrade() {
 EOF
 	fi
 
-	if test "$((_tru_mode ^ (1 << 2)))" -ne $((1 << 2)); then
+	# 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}"

diff --git a/xml/test-2/020-rsc-requires-inline.ref b/xml/test-2/020-rsc-requires-inline.ref
@@ -20,7 +20,7 @@
         <instance_attributes id="myAddr-params">
           <nvpair id="myAddr-ip" name="ip" value="192.0.2.10"/>
         </instance_attributes>
-      <meta_attributes id="_2TO3_myAddr-meta"> <nvpair id="_2TO3_myAddr-start-meta-requires" name="requires" value="nothing"/></meta_attributes></primitive>
+      <meta_attributes id="_2TO3_myAddr-meta"><nvpair id="_2TO3_myAddr-start-meta-requires" name="requires" value="nothing"/></meta_attributes></primitive>
 
       <primitive id="myHttpd" class="ocf" provider="heartbeat" type="apache">
         <operations>

diff --git a/xml/test-2/024-rsc-requires-no-selfclash.ref b/xml/test-2/024-rsc-requires-no-selfclash.ref
@@ -48,7 +48,7 @@
         <instance_attributes id="myAddr2-params">
           <nvpair id="myAddr2-ip" name="ip" value="192.0.2.10"/>
         </instance_attributes>
-      <meta_attributes id="_2TO3_myAddr2-meta"> <nvpair id="_2TO3_myAddr2-start-meta-requires" name="requires" value="nothing"/></meta_attributes></primitive>
+      <meta_attributes id="_2TO3_myAddr2-meta"><nvpair id="_2TO3_myAddr2-start-meta-requires" name="requires" value="nothing"/></meta_attributes></primitive>
 
       <!-- potential clash between multiple op[@name = 'start'
                                                or
@@ -72,7 +72,7 @@
             <!-- demote != promote -->
             <op id="stateful1-demote" interval="0" name="demote" timeout="40s"/>
           </operations>
-        <meta_attributes id="_2TO3_stateful1-meta"> <nvpair id="_2TO3_stateful1-start-meta-requires" name="requires" value="fencing"/></meta_attributes></primitive>
+        <meta_attributes id="_2TO3_stateful1-meta"><nvpair id="_2TO3_stateful1-start-meta-requires" name="requires" value="fencing"/></meta_attributes></primitive>
       </clone>
 
       <!-- potential clash between multiple