Run all of the tests

sdrobert · Feb 22, 2016 · 28166d3 · 28166d3
1 parent d3b0a19
commit 28166d3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/cmake/KenLMFunctions.cmake b/cmake/KenLMFunctions.cmake
@@ -74,8 +74,7 @@ function(AddTests)
   cmake_parse_arguments(AddTests "" "" "${multiValueArgs}" ${ARGN})
 
   # Iterate through the Boost tests list
-  foreach(test ${KENLM_BOOST_TESTS_LIST})
-
+  foreach(test ${AddTests_TESTS})
     KenLMAddTest(TEST ${test}
                  DEPENDS ${AddTests_DEPENDS}
                  LIBRARIES ${AddTests_LIBRARIES}

diff --git a/lm/interpolate/CMakeLists.txt b/lm/interpolate/CMakeLists.txt
@@ -30,22 +30,21 @@ if(EIGEN3_FOUND AND 3.1.0 VERSION_LESS ${EIGEN3_VERSION})
           LIBRARIES ${KENLM_INTERPOLATE_LIBS})
 
   if(BUILD_TESTING)
-      set(KENLM_INTERPOLATE_TESTS
-          backoff_reunification_test
-          bounded_sequence_encoding_test
-          merge_vocab_test
-          normalize_test
-          tune_derivatives_test)
-
-      AddTests(TESTS ${KENLM_INTERPOLATE_TESTS}
+      AddTests(TESTS backoff_reunification_test bounded_sequence_encoding_test normalize_test tune_derivatives_test
                LIBRARIES ${KENLM_INTERPOLATE_LIBS} pthread)
 
       # tune_instances_test needs an extra command line parameter
       KenLMAddTest(TEST tune_instances_test
-                   DEPENDS ${KENLM_INTERPOLATE_DEPENDS}
                    LIBRARIES ${KENLM_INTERPOLATE_LIBS}
-                   TEST_ARGS
-                   ${CMAKE_CURRENT_SOURCE_DIR}/tune_instances_data/toy0.1)
+                   TEST_ARGS ${CMAKE_CURRENT_SOURCE_DIR}/tune_instances_data/toy0.1)
+
+      foreach(test_file test1 test2 test3 test_bad_order test_no_unk)
+        set(KENLM_MERGE_TESTS_PATH ${KENLM_MERGE_TESTS_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/merge_test/${test_file})
+      endforeach(test_file)
+
+      KenLMAddTest(TEST merge_vocab_test
+                   LIBRARIES ${KENLM_INTERPOLATE_LIBS}
+                   TEST_ARGS ${KENLM_MERGE_TESTS_PATH})
   endif()
 else()
   if (EIGEN3_FOUND)

diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
@@ -35,26 +35,24 @@ add_subdirectory(double-conversion)
 add_subdirectory(stream)
 
 # Group these objects together for later use. 
-#
-# Given add_library(foo OBJECT ${my_foo_sources}),
-# refer to these objects as $<TARGET_OBJECTS:foo>
-#
 add_library(kenlm_util ${KENLM_UTIL_DOUBLECONVERSION_SOURCE} ${KENLM_UTIL_STREAM_SOURCE} ${KENLM_UTIL_SOURCE})
 
 AddExes(EXES probing_hash_table_benchmark
         LIBRARIES kenlm_util ${Boost_LIBRARIES} pthread ${TIMER_LINK})
 
 # Only compile and run unit tests if tests should be run
 if(BUILD_TESTING)
-
-  # Explicitly list the Boost test files to be compiled
   set(KENLM_BOOST_TESTS_LIST
     bit_packing_test
+    integer_to_string_test
     joint_sort_test
     multi_intersection_test
+    pcqueue_test
     probing_hash_table_test
     read_compressed_test
+    sized_iterator_test
     sorted_uniform_test
+    string_stream_test
     tokenize_piece_test
   )
 

diff --git a/util/stream/CMakeLists.txt b/util/stream/CMakeLists.txt
@@ -31,6 +31,7 @@ if(BUILD_TESTING)
     io_test
     sort_test
     stream_test
+    rewindable_stream_test
   )
 
   AddTests(TESTS ${KENLM_BOOST_TESTS_LIST}