zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #02261
[Merge] lp:~zorba-coders/zorba/bug_897619 into lp:zorba
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/bug_897619 into lp:zorba.
Requested reviews:
Sorin Marian Nasoi (sorin.marian.nasoi)
Markos Zaharioudakis (markos-za)
Related bugs:
Bug #897619 in Zorba: "testdriver_mt can not run the XQueryX tests"
https://bugs.launchpad.net/zorba/+bug/897619
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug_897619/+merge/83759
Fix for bug #897619.
--
https://code.launchpad.net/~zorba-coders/zorba/bug_897619/+merge/83759
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2011-11-23 22:25:05 +0000
+++ ChangeLog 2011-11-29 11:22:28 +0000
@@ -72,6 +72,7 @@
* Fixed bug #862089 (Split binary/xq install directories for modules) by
splitting "module path" into separate URI and Library paths
* Fixed bug #872502 (validation of the JSON module xqdoc fails)
+ * Fixed bug #897619 (testdriver_mt can not run the XQueryX tests)
* Fixed bug #867107 (xqdoc dependency to zorba is wrong)
version 2.0.3
=== modified file 'test/rbkt/testdriver_mt.cpp'
--- test/rbkt/testdriver_mt.cpp 2011-10-25 08:59:34 +0000
+++ test/rbkt/testdriver_mt.cpp 2011-11-29 11:22:28 +0000
@@ -732,6 +732,7 @@
std::string reportFilepath;
std::string XMLreportFilepath;
std::string knownFailuresFilepath;
+ std::string testExtension = ".xq";
bool haveKnownFailures = false;
bool quiet = false;
bool generateW3CData = false;
@@ -860,7 +861,10 @@
{
ulong pos;
if ((pos = refsDir.find("XQueryX")) != std::string::npos)
+ {
refsDir = refsDir.erase(pos, 8);
+ testExtension = ".xqx";
+ }
else if ((pos = refsDir.find("XQuery")) != std::string::npos)
refsDir = refsDir.erase(pos, 7);
}
@@ -924,7 +928,7 @@
continue;
}
- if (fs::extension(queryPath) != ".xq")
+ if (fs::extension(queryPath) != testExtension)
{
//std::cerr << "Found no-query file " << queryPath.string() << std::endl;
continue;
Follow ups