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

[Paul J. Lucas]

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

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

[Paul J. Lucas (paul-lucas)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-03-22T04-43-45.389Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-03-22T18-23-52.328Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2013-03-22T18-23-52.328Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/runtime/durations_dates_times/format_dateTime.cpp'
--- src/runtime/durations_dates_times/format_dateTime.cpp	2013-03-20 15:35:21 +0000
+++ src/runtime/durations_dates_times/format_dateTime.cpp	2013-03-22 04:39:23 +0000
@@ -204,7 +204,7 @@
   { "nine",      "ninth"       },
   { "ten",       "tenth"       },
   { "eleven",    "eleventh"    },
-  { "twelve",    "twelveth"    },
+  { "twelve",    "twelfth"     },
   { "thirteen",  "thirteenth"  },
   { "fourteen",  "fourteenth"  },
   { "fifteen",   "fifteenth"   },
 
=== modified file 'src/runtime/full_text/thesauri/wn_types.cpp'
--- src/runtime/full_text/thesauri/wn_types.cpp	2013-02-28 11:15:32 +0000
+++ src/runtime/full_text/thesauri/wn_types.cpp	2013-03-22 04:39:23 +0000
@@ -15,11 +15,14 @@
  */
 #include "stdafx.h"
 
+// standard
 #include <algorithm>                    /* for lower_bound */
 
+// Zorba
 #include "util/less.h"
 #include "diagnostics/assert.h"
 
+// local
 #include "wn_types.h"
 
 using namespace std;
 
=== modified file 'src/zorbautils/locale.cpp'
--- src/zorbautils/locale.cpp	2013-03-19 14:41:54 +0000
+++ src/zorbautils/locale.cpp	2013-03-22 04:39:23 +0000
@@ -15,6 +15,10 @@
  */
 #include "stdafx.h"
 
+// standard
+#include <algorithm>
+#include <cstring>
+#include <stdexcept>
 #ifdef WIN32
 # include <windows.h>
 # include "zorbautils/fatal.h"
@@ -25,13 +29,8 @@
 # include <xlocale.h>                   /* for newlocale(3) */
 #endif /* WIN32 */
 
-#include <algorithm>
-#include <cstring>
-#include <stdexcept>
-
+// Zorba
 #include <zorba/internal/unique_ptr.h>
-
-// Zorba
 #include "util/ascii_util.h"
 #include "util/cxx_util.h"
 #include "util/less.h"
 
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-03-21 21:48:52 +0000
+++ test/fots/CMakeLists.txt	2013-03-22 04:39:23 +0000
@@ -163,9 +163,6 @@
 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en126 0)
 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en127 0)
 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en128 0)
-EXPECTED_FOTS_FAILURE (fn-format-date format-date-en129 0)
-EXPECTED_FOTS_FAILURE (fn-format-date format-date-en130 0)
-EXPECTED_FOTS_FAILURE (fn-format-date format-date-en131 0)
 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en132 0)
 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en133 0)
 EXPECTED_FOTS_FAILURE (fn-format-date format-date-en134 0)