From 664e04ede332f19795d9c5c9a51639d63fbc5065 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 29 Jul 2013 15:13:36 +0000
Subject: [PATCH] CR-2055 Use "useCompareResultCode" option for ldif-diff and ldapcompare tools => fixed call to ldif-diff tool in verifyTrees function
---
opends/tests/staf-tests/shared/functions/tools.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/opends/tests/staf-tests/shared/functions/tools.xml b/opends/tests/staf-tests/shared/functions/tools.xml
index 95c1666..73879eb 100755
--- a/opends/tests/staf-tests/shared/functions/tools.xml
+++ b/opends/tests/staf-tests/shared/functions/tools.xml
@@ -815,8 +815,7 @@
'dsPath' : dsPath,
'sourceLdif' : '%s/../%s' % (dsPath, sampleTree),
'targetLdif' : '%s/../%s' % (dsPath, referenceTree),
- 'outputLdif' : '%s/../%s' % (dsPath, treeDiffs),
- 'ignoreAttrsFile' : ignoreAttrsFile
+ 'outputLdif' : '%s/../%s' % (dsPath, treeDiffs)
}
</call>
<if expr="STAXResult != 6">
@@ -2032,7 +2031,10 @@
}
</call>
- <if expr="RC == 5 and expectedRC != 5">
+ <script>
+ STAXCode=RC
+ </script>
+ <if expr="STAXCode == 5 and expectedRC != 5">
<sequence>
<!-- Check the size of the diff file, and avoid reading its
content with getFile if the file is too big to prevent
@@ -2089,7 +2091,7 @@
</else>
</if>
- <return>STAXResult</return>
+ <return>STAXCode</return>
</sequence>
</function>
--
Gitblit v1.10.0