master
Fix CMake-based testing
Rename err.h to avoid conflict with system header
Convert the tools and respective tests to SPDX (#2317)