fixing issue with accidentally disabled tests.

.github/workflows/alpine.yml

@@ -20,7 +20,7 @@ jobs:
  ./alpine.sh apk add build-base cmake g++ linux-headers git bash
  - name: cmake
  run: |
- ./alpine.sh cmake -B build_for_alpine
+ ./alpine.sh cmake -DENABLE_ROARING_TESTS=ON -B build_for_alpine
  - name: build
  run: |
  ./alpine.sh cmake --build build_for_alpine

.github/workflows/macos-ci.yml

@@ -17,14 +17,14 @@ jobs:
  run: |
  mkdir build
  cd build
- cmake -DCMAKE_INSTALL_PREFIX:PATH=destination ..
+ cmake -DCMAKE_INSTALL_PREFIX:PATH=destination -DENABLE_ROARING_TESTS=ON ..
  cmake --build . 
  ctest . --output-on-failure
  cmake --install . 
  cd ../tests/installation/find && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../build/destination .. && cmake --build .
  - name: Build and Test (shared)
  run: |
- cmake -DBUILD_SHARED_LIBS=ON -B buildshared -DCMAKE_INSTALL_PREFIX:PATH=destinationshared
+ cmake -DBUILD_SHARED_LIBS=ON  -DCMAKE_INSTALL_PREFIX:PATH=destinationshared -DENABLE_ROARING_TESTS=ON -B buildshared
  cmake --build buildshared
  cmake --install buildshared
  cd tests/installation/find
@@ -35,7 +35,7 @@ jobs:
  run: |
  mkdir builddebug
  cd builddebug
- cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=destination ..
+ cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=destination -DENABLE_ROARING_TESTS=ON ..
  cmake --build . 
  ctest . --output-on-failure
  cmake --install . 

.github/workflows/s390x.yml

@@ -27,7 +27,7 @@ jobs:
  apt-get update -q -y
  apt-get install -y cmake make g++
  run: |
- cmake -DCMAKE_BUILD_TYPE=Release -B build
+ cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_ROARING_TESTS=ON -B build
  cmake --build build -j=2
  ctest --output-on-failure --test-dir build
 

.github/workflows/ubuntu-ci.yml

@@ -22,17 +22,17 @@ jobs:
  run: |
  mkdir build
  cd build
- cmake -DCMAKE_INSTALL_PREFIX:PATH=destination ..
- cmake --build . 
+ cmake -DCMAKE_INSTALL_PREFIX:PATH=destination -DENABLE_ROARING_TESTS=ON ..
+ cmake --build .
  ctest . --output-on-failure
  cmake --install . 
  cd ../tests/installation/find && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../build/destination .. && cmake --build .
  - name: Build and Test Debug
  run: |
  mkdir builddebug
  cd builddebug
- cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=destination ..
- cmake --build . 
+ cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=destination -DENABLE_ROARING_TESTS=ON ..
+ cmake --build .
  ctest . --output-on-failure
  cmake --install . 
  cd ../tests/installation/find && mkdir builddebug && cd builddebug && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=../../../build/destination .. && cmake --build .

.github/workflows/ubuntu-debug-sani-ci.yml

@@ -22,6 +22,6 @@ jobs:
  run: |
  mkdir build
  cd build
- cmake -DCMAKE_BUILD_TYPE=Debug -DROARING_SANITIZE=ON ..
+ cmake -DCMAKE_BUILD_TYPE=Debug -DROARING_SANITIZE=ON -DENABLE_ROARING_TESTS=ON ..
  cmake --build . 
  ctest . --output-on-failure

.github/workflows/ubuntu-gcc10-ci.yml

@@ -24,6 +24,6 @@ jobs:
  run: |
  mkdir build
  cd build
- cmake ..
- cmake --build . 
+ cmake -DENABLE_ROARING_TESTS=ON ..
+ cmake --build .
  ctest . --output-on-failure

.github/workflows/ubuntu-legacy-ci.yml

@@ -1,4 +1,4 @@
-name: Ubuntu-CI
+name: Ubuntu-Legacy-CI
 
 'on':
  - push
@@ -18,8 +18,8 @@ jobs:
  run: |
  mkdir build
  cd build
- cmake -DROARING_DISABLE_AVX=ON -DCMAKE_INSTALL_PREFIX:PATH=destination ..
- cmake --build . 
+ cmake -DROARING_DISABLE_AVX=ON -DCMAKE_INSTALL_PREFIX:PATH=destination -DENABLE_ROARING_TESTS=ON ..
+ cmake --build .
  ctest . --output-on-failure
  cmake --install . 
  cd ../tests/installation/find && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=../../../build/destination .. && cmake --build .

.github/workflows/ubuntu-noexcept-ci.yml

@@ -22,6 +22,6 @@ jobs:
  run: |
  mkdir build
  cd build
- cmake -DCMAKE_CXX_FLAGS=-fno-exceptions -DROARING_EXCEPTIONS=OFF ..
+ cmake -DCMAKE_CXX_FLAGS=-fno-exceptions -DROARING_EXCEPTIONS=OFF -DENABLE_ROARING_TESTS=ON .. 
  cmake --build . 
  ctest . --output-on-failure

.github/workflows/ubuntu-sani-ci.yml

@@ -22,6 +22,6 @@ jobs:
  run: |
  mkdir build
  cd build
- cmake -DROARING_SANITIZE=ON ..
+ cmake -DROARING_SANITIZE=ON -DENABLE_ROARING_TESTS=ON ..
  cmake --build . 
  ctest . --output-on-failure

.github/workflows/ubuntu-sani-thread-ci.yml

@@ -22,6 +22,6 @@ jobs:
  run: |
  mkdir build
  cd build
- cmake -DROARING_SANITIZE_THREADS=ON ..
+ cmake -DROARING_SANITIZE_THREADS=ON -DENABLE_ROARING_TESTS=ON ..
  cmake --build . 
  ctest . --output-on-failure

.github/workflows/vs16-ci.yml

@@ -21,7 +21,7 @@ jobs:
  - name: Configure
  run: |
  mkdir build
- cd build && cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} ..
+ cd build && cmake -DENABLE_ROARING_TESTS=ON -G "${{matrix.gen}}" -A ${{matrix.arch}} ..
  - name: Build
  run: cmake --build build --config Release
  - name: Run basic tests

.github/workflows/vs17-ci.yml

@@ -21,7 +21,7 @@ jobs:
  - name: Configure
  run: |
  mkdir build
- cd build && cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} ..
+ cd build && cmake -DENABLE_ROARING_TESTS=ON -G "${{matrix.gen}}" -A ${{matrix.arch}} ..
  - name: Build
  run: cmake --build build --config Release
  - name: Run basic tests

.github/workflows/vs17-clang-ci.yml

@@ -21,7 +21,7 @@ jobs:
  - name: Configure
  run: |
  mkdir build
- cd build && cmake -G "${{matrix.gen}}" -A ${{matrix.arch}} -T ClangCL ..
+ cd build && cmake -DENABLE_ROARING_TESTS=ON -G "${{matrix.gen}}" -A ${{matrix.arch}} -T ClangCL ..
  - name: Build
  run: cmake --build build --config Release --parallel
  - name: Run basic tests

CMakeLists.txt

@@ -45,14 +45,17 @@ option(ROARING_BUILD_C_TESTS_AS_CPP "Build test C files using C++ compilation" O
 option(ROARING_SANITIZE "Sanitize addresses" OFF)
 option(ROARING_SANITIZE_THREADS "Sanitize threads" OFF)
 
-option(ENABLE_ROARING_TESTS "If OFF, disable unit tests altogether" ${BUILD_TESTING})
+option(ENABLE_ROARING_TESTS "If OFF, disable unit tests altogether" ON)
+if(NOT ENABLE_ROARING_TESTS)
+ message(STATUS "Tests are disabled, you can enabled them by setting ENABLE_ROARING_TESTS to ON")
+endif()
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake")
 
+include(cmake/CPM.cmake)
 find_package(CTargets)
 find_package(Options)
 find_package(LTO)
-include(cmake/CPM.cmake)
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/roaring.pc.in"
  "${CMAKE_CURRENT_BINARY_DIR}/roaring.pc" @ONLY)

README.md

@@ -82,9 +82,9 @@ Linux or macOS users might follow the following instructions if they have a rece
 
  1. Pull the library in a directory
  ```
- wget https://github.com/RoaringBitmap/CRoaring/releases/download/v2.0.3/roaring.c
- wget https://github.com/RoaringBitmap/CRoaring/releases/download/v2.0.3/roaring.h
- wget https://github.com/RoaringBitmap/CRoaring/releases/download/v2.0.3/roaring.hh
+ wget https://github.com/RoaringBitmap/CRoaring/releases/download/v2.0.4/roaring.c
+ wget https://github.com/RoaringBitmap/CRoaring/releases/download/v2.0.4/roaring.h
+ wget https://github.com/RoaringBitmap/CRoaring/releases/download/v2.0.4/roaring.hh
  ```
  2. Create a new file named `demo.c` with this content:
  ```C

include/roaring/portability.h

@@ -225,8 +225,8 @@ inline int roaring_leading_zeroes(unsigned long long input_num) {
 #ifndef CROARING_INTRINSICS
 #define CROARING_INTRINSICS 1
 #define roaring_unreachable __builtin_unreachable()
-static inline int roaring_trailing_zeroes(unsigned long long input_num) { return __builtin_ctzll(input_num); }
-static inline int roaring_leading_zeroes(unsigned long long input_num) { return __builtin_clzll(input_num); }
+inline int roaring_trailing_zeroes(unsigned long long input_num) { return __builtin_ctzll(input_num); }
+inline int roaring_leading_zeroes(unsigned long long input_num) { return __builtin_clzll(input_num); }
 #endif
 
 #if CROARING_REGULAR_VISUAL_STUDIO

src/roaring.c

@@ -20,7 +20,8 @@ extern "C" { namespace roaring { namespace api {
 
 #define CROARING_SERIALIZATION_ARRAY_UINT32 1
 #define CROARING_SERIALIZATION_CONTAINER 2
-
+extern inline int roaring_trailing_zeroes(unsigned long long input_num);
+extern inline int roaring_leading_zeroes(unsigned long long input_num);
 extern inline void roaring_bitmap_init_cleared(roaring_bitmap_t *r);
 extern inline bool roaring_bitmap_get_copy_on_write(const roaring_bitmap_t* r);
 extern inline void roaring_bitmap_set_copy_on_write(roaring_bitmap_t* r, bool cow);