Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

Proposed by Paul J. Lucas
Status: Merged
Approved by: Paul J. Lucas
Approved revision: 11128
Merged at revision: 11305
Proposed branch: lp:~paul-lucas/zorba/pjl-misc
Merge into: lp:zorba
Diff against target: 75 lines (+9/-10)
4 files modified
src/runtime/durations_dates_times/format_dateTime.cpp (+1/-1)
src/runtime/full_text/thesauri/wn_types.cpp (+3/-0)
src/zorbautils/locale.cpp (+5/-6)
test/fots/CMakeLists.txt (+0/-3)
To merge this branch: bzr merge lp:~paul-lucas/zorba/pjl-misc
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Paul J. Lucas Approve
Review via email: mp+154852@code.launchpad.net

Commit message

1. Fixed typo: s/twelvth/twelfth/ -- fixed 3 FOTS failing tests.
2. Other misc. tweaks.

Description of the change

1. Fixed typo: s/twelvth/twelfth/ -- fixed 3 FOTS failing tests.
2. Other misc. tweaks.

To post a comment you must log in.
Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job pjl-misc-2013-03-22T04-43-45.389Z is finished. The
  final status was:

  No tests were run - build or configure step must have failed.

  Not commiting changes.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job pjl-misc-2013-03-22T18-23-52.328Z 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/runtime/durations_dates_times/format_dateTime.cpp'
2--- src/runtime/durations_dates_times/format_dateTime.cpp 2013-03-20 15:35:21 +0000
3+++ src/runtime/durations_dates_times/format_dateTime.cpp 2013-03-22 04:39:23 +0000
4@@ -204,7 +204,7 @@
5 { "nine", "ninth" },
6 { "ten", "tenth" },
7 { "eleven", "eleventh" },
8- { "twelve", "twelveth" },
9+ { "twelve", "twelfth" },
10 { "thirteen", "thirteenth" },
11 { "fourteen", "fourteenth" },
12 { "fifteen", "fifteenth" },
13
14=== modified file 'src/runtime/full_text/thesauri/wn_types.cpp'
15--- src/runtime/full_text/thesauri/wn_types.cpp 2013-02-28 11:15:32 +0000
16+++ src/runtime/full_text/thesauri/wn_types.cpp 2013-03-22 04:39:23 +0000
17@@ -15,11 +15,14 @@
18 */
19 #include "stdafx.h"
20
21+// standard
22 #include <algorithm> /* for lower_bound */
23
24+// Zorba
25 #include "util/less.h"
26 #include "diagnostics/assert.h"
27
28+// local
29 #include "wn_types.h"
30
31 using namespace std;
32
33=== modified file 'src/zorbautils/locale.cpp'
34--- src/zorbautils/locale.cpp 2013-03-19 14:41:54 +0000
35+++ src/zorbautils/locale.cpp 2013-03-22 04:39:23 +0000
36@@ -15,6 +15,10 @@
37 */
38 #include "stdafx.h"
39
40+// standard
41+#include <algorithm>
42+#include <cstring>
43+#include <stdexcept>
44 #ifdef WIN32
45 # include <windows.h>
46 # include "zorbautils/fatal.h"
47@@ -25,13 +29,8 @@
48 # include <xlocale.h> /* for newlocale(3) */
49 #endif /* WIN32 */
50
51-#include <algorithm>
52-#include <cstring>
53-#include <stdexcept>
54-
55+// Zorba
56 #include <zorba/internal/unique_ptr.h>
57-
58-// Zorba
59 #include "util/ascii_util.h"
60 #include "util/cxx_util.h"
61 #include "util/less.h"
62
63=== modified file 'test/fots/CMakeLists.txt'
64--- test/fots/CMakeLists.txt 2013-03-21 21:48:52 +0000
65+++ test/fots/CMakeLists.txt 2013-03-22 04:39:23 +0000
66@@ -163,9 +163,6 @@
67 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en126 0)
68 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en127 0)
69 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en128 0)
70-EXPECTED_FOTS_FAILURE (fn-format-date format-date-en129 0)
71-EXPECTED_FOTS_FAILURE (fn-format-date format-date-en130 0)
72-EXPECTED_FOTS_FAILURE (fn-format-date format-date-en131 0)
73 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en132 0)
74 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en133 0)
75 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en134 0)

Subscribers

People subscribed via source and target branches