[liblouis-liblouisxml] [liblouis] r573 committed - Added some tests for the improved LOUIS_TABLEPATH functionality.

  • From: liblouis@xxxxxxxxxxxxxx
  • To: liblouis-liblouisxml@xxxxxxxxxxxxx
  • Date: Tue, 17 Apr 2012 08:14:20 +0000

Revision: 573
Author:   christian.egli@xxxxxxxxxxxxxx
Date:     Tue Apr 17 01:13:59 2012
Log:      Added some tests for the improved LOUIS_TABLEPATH functionality.

http://code.google.com/p/liblouis/source/detail?r=573

Added:
 /trunk/tests/tables/moreTables
 /trunk/tests/tables/moreTables/include.utb
Modified:
 /trunk/ChangeLog
 /trunk/tests
 /trunk/tests/Makefile.am
 /trunk/tests/multiple_table_path.pl

=======================================
--- /dev/null
+++ /trunk/tests/tables/moreTables/include.utb  Tue Apr 17 01:13:59 2012
@@ -0,0 +1,3 @@
+# this table simpy checks if files can be inlcuded from a local dir and from the global dir
+include pass2.ctb
+include braille-patterns.cti
=======================================
--- /trunk/ChangeLog    Fri Apr 13 05:45:35 2012
+++ /trunk/ChangeLog    Tue Apr 17 01:13:59 2012
@@ -1,3 +1,10 @@
+2012-04-17  Christian Egli  <christian.egli@xxxxxx>
+
+       * tests/tables/moreTables/include.utb:
+       * tests/Makefile.am (TESTS_ENVIRONMENT):
+       * tests/multiple_table_path.pl: Added some tests for the improved
+       LOUIS_TABLEPATH functionality.
+
 2012-04-13  Christian Egli  <christian.egli@xxxxxx>

        * tests/Makefile.am:
=======================================
--- /trunk/tests/Makefile.am    Fri Apr 13 05:45:35 2012
+++ /trunk/tests/Makefile.am    Tue Apr 17 01:13:59 2012
@@ -89,9 +89,9 @@

 HARNESS_DIR = $(top_srcdir)/tests/harness

-TESTS_ENVIRONMENT =                                                    \
-       LOUIS_TABLEPATH=$(top_srcdir)/tables,$(top_srcdir)/tests/tables \
-       PYTHONPATH=$(HARNESS_DIR):$(top_srcdir)/python:$$PYTHONPATH     \
-       HARNESS_DIR=$(HARNESS_DIR)                                      \
-       LD_LIBRARY_PATH=$(top_srcdir)/liblouis/.libs:$$LD_LIBRARY_PATH  \
+TESTS_ENVIRONMENT =                                                            
                                \
+ LOUIS_TABLEPATH=$(top_srcdir)/tables,$(top_srcdir)/tests/tables,$(top_srcdir)/tests/tables/moreTables \
+       PYTHONPATH=$(HARNESS_DIR):$(top_srcdir)/python:$$PYTHONPATH             
                                \
+       HARNESS_DIR=$(HARNESS_DIR)                                              
                                \
+       LD_LIBRARY_PATH=$(top_srcdir)/liblouis/.libs:$$LD_LIBRARY_PATH          
                                \
        PATH=$(top_srcdir)/tools:$$PATH
=======================================
--- /trunk/tests/multiple_table_path.pl Wed Mar 30 02:37:02 2011
+++ /trunk/tests/multiple_table_path.pl Tue Apr 17 01:13:59 2012
@@ -24,7 +24,21 @@
     # a table with an absolute path
     abs_path("$ENV{srcdir}/tables/loop.ctb"),
     # a list of tables with an absolute path
-    abs_path("$ENV{srcdir}/../tables/en-us-g2.ctb") . ",en-us-g1.ctb"
+    abs_path("$ENV{srcdir}/../tables/en-us-g2.ctb") . ",en-us-g1.ctb",
+    # table combinations
+    # all global tables
+    "en-us-g2.ctb,braille-patterns.cti",
+    # a global and a local table
+    "braille-patterns.cti,pass2.ctb",
+    # a local and a global table
+    "pass2.ctb,braille-patterns.cti",
+    # a relative, a local and a global table
+    "$ENV{srcdir}/tables/loop.ctb,pass2.ctb,braille-patterns.cti",
+    # a table which includes local and global tables
+    "include.utb",
+    # a relative table and a table which includes local and global tables
+    # currently fails
+#    "$ENV{srcdir}/tables/loop.ctb,include.utb",
     );

 # ensure existing tables are found
For a description of the software, to download it and links to
project pages go to http://www.abilitiessoft.com

Other related posts:

  • » [liblouis-liblouisxml] [liblouis] r573 committed - Added some tests for the improved LOUIS_TABLEPATH functionality. - liblouis