Merge pull request #1650 from jeromekelleher/enable-big-tables-test

Enable BIG_TABLES tests

Author: mergify[bot]

.circleci/config.yml

@@ -39,14 +39,11 @@ commands:
             CC=clang CXX=clang++ meson build-clang c
             ninja -C build-clang
 
-      # Disabling these while the transition to 64 bit offsets is under way.
-      # See #1527 for details.
-      # NOTE: make sure we renable the valgrind tests below too.
-      # - run:
-      #     name: Compile C with gcc in 64 bit mode
-      #     command: |
-      #       CFLAGS=-D_TSK_BIG_TABLES CPPFLAGS=-D_TSK_BIG_TABLES meson build-gcc-64 c
-      #       ninja -C build-gcc-64
+      - run:
+          name: Compile C with gcc in 64 bit mode
+          command: |
+            CFLAGS=-D_TSK_BIG_TABLES CPPFLAGS=-D_TSK_BIG_TABLES meson build-gcc-bt c
+            ninja -C build-gcc-bt
 
       - run:
           name: Run C tests
@@ -74,18 +71,18 @@ commands:
             valgrind --leak-check=full --error-exitcode=1 ./build-gcc/test_file_format
             valgrind --leak-check=full --error-exitcode=1 ./build-gcc/test_minimal_cpp
 
-      # - run:
-      #     name: Valgrind for 64 bit C tests.
-      #     command: |
-      #       valgrind --leak-check=full --error-exitcode=1 ./build-gcc-64/test_core
-      #       valgrind --leak-check=full --error-exitcode=1 ./build-gcc-64/test_tables
-      #       valgrind --leak-check=full --error-exitcode=1 ./build-gcc-64/test_trees
-      #       valgrind --leak-check=full --error-exitcode=1 ./build-gcc-64/test_genotypes
-      #       valgrind --leak-check=full --error-exitcode=1 ./build-gcc-64/test_convert
-      #       valgrind --leak-check=full --error-exitcode=1 ./build-gcc-64/test_stats
-      #       valgrind --leak-check=full --error-exitcode=1 ./build-gcc-64/test_haplotype_matching
-      #       valgrind --leak-check=full --error-exitcode=1 ./build-gcc-64/test_file_format
-      #       valgrind --leak-check=full --error-exitcode=1 ./build-gcc-64/test_minimal_cpp
+      - run:
+          name: Valgrind for BIG_TABLES C tests.
+          command: |
+            valgrind --leak-check=full --error-exitcode=1 ./build-gcc-bt/test_core
+            valgrind --leak-check=full --error-exitcode=1 ./build-gcc-bt/test_tables
+            valgrind --leak-check=full --error-exitcode=1 ./build-gcc-bt/test_trees
+            valgrind --leak-check=full --error-exitcode=1 ./build-gcc-bt/test_genotypes
+            valgrind --leak-check=full --error-exitcode=1 ./build-gcc-bt/test_convert
+            valgrind --leak-check=full --error-exitcode=1 ./build-gcc-bt/test_stats
+            valgrind --leak-check=full --error-exitcode=1 ./build-gcc-bt/test_haplotype_matching
+            valgrind --leak-check=full --error-exitcode=1 ./build-gcc-bt/test_file_format
+            valgrind --leak-check=full --error-exitcode=1 ./build-gcc-bt/test_minimal_cpp
 
       - run:
           name: Run clang-compiled C tests