Merge lp:~zorba-coders/zorba/ctest-j8 into lp:zorba

Proposed by Chris Hillery on 2013-02-08
Status: Merged
Approved by: Chris Hillery on 2013-02-08
Approved revision: 11224
Merged at revision: 11224
Proposed branch: lp:~zorba-coders/zorba/ctest-j8
Merge into: lp:zorba
Diff against target: 83 lines (+9/-11)
5 files modified
test/commons/testdriver_comparator.cpp (+7/-5)
test/commons/testdriver_comparator.h (+0/-1)
test/rbkt/testdriver.cpp (+1/-2)
test/rbkt/testdriver_mt.cpp (+0/-1)
test/update/updtestdriver.cpp (+1/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/ctest-j8
Reviewer Review Type Date Requested Status
Matthias Brantner Approve on 2013-02-08
Chris Hillery Approve on 2013-02-08
Review via email: mp+147266@code.launchpad.net

Commit message

Create canonicalized ref/result files based on generated resultfile path, so they are always in the binary dir and unique across tests.

To post a comment you must log in.
Chris Hillery (ceejatec) :
review: Approve
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job ctest-j8-2013-02-08T01-20-39.373Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/commons/testdriver_comparator.cpp'
2--- test/commons/testdriver_comparator.cpp 2012-09-19 21:16:15 +0000
3+++ test/commons/testdriver_comparator.cpp 2013-02-08 01:13:28 +0000
4@@ -34,11 +34,9 @@
5 /*******************************************************************************
6
7 ********************************************************************************/
8-int canonicalizeAndCompare(
9- const std::string& aComparisonMethod,
10+int canonicalizeAndCompare(const std::string& aComparisonMethod,
11 const char* aRefFile,
12 const char* aResultFile,
13- const std::string& aRBKTBinDir,
14 std::ostream& aOutput)
15 {
16 xmlDocPtr lRefResult_ptr;
17@@ -177,8 +175,12 @@
18 return 8;
19 }
20
21- std::string lCanonicalRefFile = aRBKTBinDir + "/canonical_ref.xml";
22- std::string lCanonicalResFile = aRBKTBinDir + "/canonical_res.xml";
23+ // Form filenames to output canonicalized files based on the *actual* result
24+ // filename, since that will be in the build dir and unique to this test
25+ std::string lCanonicalRefFile(aResultFile);
26+ lCanonicalRefFile.append( ".canonical_ref.xml");
27+ std::string lCanonicalResFile(aResultFile);
28+ lCanonicalResFile.append(".canonical_res.xml");
29
30 int lRefResultRes = xmlC14NDocSave(lRefResult_ptr, 0, 0, NULL, 0, lCanonicalRefFile.c_str(), 0);
31 int lResultRes = xmlC14NDocSave(lResult_ptr, 0, 0, NULL, 0, lCanonicalResFile.c_str(), 0);
32
33=== modified file 'test/commons/testdriver_comparator.h'
34--- test/commons/testdriver_comparator.h 2012-09-19 21:16:15 +0000
35+++ test/commons/testdriver_comparator.h 2013-02-08 01:13:28 +0000
36@@ -28,7 +28,6 @@
37 canonicalizeAndCompare(const std::string& aComparisonMethod,
38 const char* aRefFile,
39 const char* aResultFile,
40- const std::string& aRBKTBinDir,
41 std::ostream& = std::cout);
42
43 void
44
45=== modified file 'test/rbkt/testdriver.cpp'
46--- test/rbkt/testdriver.cpp 2012-10-08 12:09:36 +0000
47+++ test/rbkt/testdriver.cpp 2013-02-08 01:13:28 +0000
48@@ -559,8 +559,7 @@
49 else {
50 int lCanonicalRes = zorba::canonicalizeAndCompare(lSpec.getComparisonMethod(),
51 lIter->c_str(),
52- lResultFile.c_str(),
53- rbkt_bin_dir);
54+ lResultFile.c_str());
55 if (lCanonicalRes == 0)
56 {
57 std::cout << "testdriver: success (canonical result # " << i
58
59=== modified file 'test/rbkt/testdriver_mt.cpp'
60--- test/rbkt/testdriver_mt.cpp 2012-12-14 09:39:17 +0000
61+++ test/rbkt/testdriver_mt.cpp 2013-02-08 01:13:28 +0000
62@@ -710,7 +710,6 @@
63 int lCanonicalRes = zorba::canonicalizeAndCompare(querySpec.getComparisonMethod(),
64 refFilePath.c_str(),
65 resFilePath.c_str(),
66- rbkt_bin_dir,
67 queries->theOutput);
68 if (lCanonicalRes == 0)
69 {
70
71=== modified file 'test/update/updtestdriver.cpp'
72--- test/update/updtestdriver.cpp 2012-09-19 21:16:15 +0000
73+++ test/update/updtestdriver.cpp 2013-02-08 01:13:28 +0000
74@@ -481,8 +481,7 @@
75 int lCanonicalRes =
76 zorba::canonicalizeAndCompare(State::compareTypeStr(lState->theCompareTypes[i]),
77 lRefFile.get_path().c_str(),
78- lResultFile.get_path().c_str(),
79- zorba::UPDATE_BINARY_DIR.c_str());
80+ lResultFile.get_path().c_str());
81 if (lCanonicalRes == 0)
82 {
83 anyMatch = true;

Subscribers

People subscribed via source and target branches