Merge remote-tracking branch 'goog/ics-ub-google-tts' into jb-mr2-devandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devidea133-weekly-releaseidea133

1 files changed, 41 insertions, 0 deletions

diff --git a/src/test/fst_test.h b/src/test/fst_test.h
index 8f9dca0..fdc9209 100644
--- a/src/test/fst_test.h
+++ b/src/test/fst_test.h
@@ -51,6 +51,8 @@ class FstTester {
     testfst_ = new F(vfst);
   }
 
+  explicit FstTester(F *testfst) : testfst_(testfst) { }
+
   ~FstTester() {
     delete testfst_;
   }
@@ -207,6 +209,7 @@ class FstTester {
   template <class G>
   void TestIO(const G &fst) const {
     const string filename = FLAGS_tmpdir + "/test.fst";
+    const string aligned = FLAGS_tmpdir + "/aligned.fst";
     {
       // write/read
       CHECK(fst.Write(filename));
@@ -232,6 +235,44 @@ class FstTester {
       delete hfst;
     }
 
+    {
+      // check mmaping by first writing the file with the aligned attribute set
+      {
+        ofstream ostr(aligned.c_str());
+        FstWriteOptions opts;
+        opts.source = aligned;
+        opts.align = true;
+        CHECK(fst.Write(ostr, opts));
+      }
+      ifstream istr(aligned.c_str());
+      FstReadOptions opts;
+      opts.mode = FstReadOptions::ReadMode("map");
+      opts.source = aligned;
+      G *gfst = G::Read(istr, opts);
+      CHECK(gfst);
+      TestBase(*gfst);
+      delete gfst;
+    }
+
+    // check mmaping of unaligned files to make sure it does not fail.
+    {
+      {
+        ofstream ostr(aligned.c_str());
+        FstWriteOptions opts;
+        opts.source = aligned;
+        opts.align = false;
+        CHECK(fst.Write(ostr, opts));
+      }
+      ifstream istr(aligned.c_str());
+      FstReadOptions opts;
+      opts.mode = FstReadOptions::ReadMode("map");
+      opts.source = aligned;
+      G *gfst = G::Read(istr, opts);
+      CHECK(gfst);
+      TestBase(*gfst);
+      delete gfst;
+    }
+
     // expanded write/read/test
     if (fst.Properties(kExpanded, false)) {
       ExpandedFst<Arc> *efst = ExpandedFst<Arc>::Read(filename);