Zorba

Merge lp:~zorba-coders/zorba/windows-hashmap-workaround into lp:zorba

  1. windows-hashmap-workaround
  2. Merge into trunk
Proposed by Chris Hillery on 2012-10-27
Status: Merged
Approved by: Rodolfo Ochoa on 2012-10-31
Approved revision: 11113
Merged at revision: 11119
Proposed branch: lp:~zorba-coders/zorba/windows-hashmap-workaround
Merge into: lp:zorba
Diff against target: 24 lines (+2/-2)
2 files modified
src/unit_tests/CMakeLists.txt (+1/-1)
src/unit_tests/unit_tests.cpp (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/windows-hashmap-workaround
Reviewer Review Type Date Requested Status
Rodolfo Ochoa 2012-10-31 Approve on 2012-10-31
Chris Hillery Approve on 2012-10-27
Review via email: mp+131716@code.launchpad.net

Commit message

Temporarily disabling a test program that causes Windows compilation errors.

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

Validation queue job windows-hashmap-workaround-2012-10-27T01-57-37.438Z is finished. The final status was:

All tests succeeded!

Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve.

Zorba Build Bot (zorba-buildbot) wrote :
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job windows-hashmap-workaround-2012-10-31T07-24-47.126Z is finished. The final status was:

All tests succeeded!

Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

Rodolfo Ochoa (rodolfo-ochoa) :
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job windows-hashmap-workaround-2012-10-31T15-08-44.844Z 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 'src/unit_tests/CMakeLists.txt'
2--- src/unit_tests/CMakeLists.txt 2012-09-19 21:16:15 +0000
3+++ src/unit_tests/CMakeLists.txt 2012-10-27 01:45:24 +0000
4@@ -25,7 +25,7 @@
5 test_uri.cpp
6 test_json_parser.cpp
7 test_fs_iterator.cpp
8- test_hashmaps.cpp
9+# test_hashmaps.cpp
10 # memory_manager.cpp
11 )
12
13
14=== modified file 'src/unit_tests/unit_tests.cpp'
15--- src/unit_tests/unit_tests.cpp 2012-09-19 21:16:15 +0000
16+++ src/unit_tests/unit_tests.cpp 2012-10-27 01:45:24 +0000
17@@ -71,7 +71,7 @@
18 libunittests["unordered_set"] = test_unordered_set;
19 #endif /* ZORBA_HAVE_UNORDERED_SET */
20
21- libunittests["hashmaps"] = test_hashmaps;
22+ // libunittests["hashmaps"] = test_hashmaps;
23
24 libunittests["uri"] = runUriTest;
25

Subscribers

People subscribed via source and target branches