From b97a244de12828df162e2e156cc95168b4b43a19 Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Sat, 18 Jan 2020 17:35:27 +0100 Subject: [PATCH] Tests did not compile --- src/CMakeLists.txt | 5 +++-- tests/ADSREnvelopeT.cpp | 2 +- tests/AudioBufferT.cpp | 4 ++-- tests/BufferT.cpp | 2 +- tests/CMakeLists.txt | 7 ++----- tests/EGDescriptionT.cpp | 2 +- tests/EventEnvelopesT.cpp | 6 +++--- tests/FilesT.cpp | 2 +- tests/HelpersT.cpp | 2 +- tests/MidiStateT.cpp | 2 +- tests/OnePoleFilterT.cpp | 2 +- tests/OpcodeT.cpp | 2 +- tests/ParsingT.cpp | 2 +- tests/RangeT.cpp | 2 +- tests/RegionActivationT.cpp | 2 +- tests/RegionT.cpp | 4 ++-- tests/RegionTriggersT.cpp | 2 +- tests/RegionValueComputationsT.cpp | 8 ++++---- tests/SIMDHelpersT.cpp | 2 +- tests/SynthT.cpp | 1 - 20 files changed, 29 insertions(+), 32 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6c35a44d..a7b439b4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,8 +23,9 @@ target_link_libraries (sfizz_parser PRIVATE absl::strings) add_library(sfizz STATIC) target_sources(sfizz PRIVATE ${SFIZZ_SOURCES} sfizz/sfizz_wrapper.cpp) target_include_directories (sfizz PUBLIC .) -target_include_directories (sfizz PRIVATE external) -target_link_libraries (sfizz PRIVATE absl::strings absl::span sfizz_parser absl::flat_hash_map Threads::Threads) +target_include_directories (sfizz PUBLIC external) +target_link_libraries (sfizz PUBLIC absl::strings absl::span) +target_link_libraries (sfizz PRIVATE sfizz_parser absl::flat_hash_map Threads::Threads) sfizz_link_libsndfile(sfizz) sfizz_enable_lto_if_needed(sfizz) diff --git a/tests/ADSREnvelopeT.cpp b/tests/ADSREnvelopeT.cpp index 7f2cea9d..d7e295fb 100644 --- a/tests/ADSREnvelopeT.cpp +++ b/tests/ADSREnvelopeT.cpp @@ -21,7 +21,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "ADSREnvelope.h" +#include "sfizz/ADSREnvelope.h" #include "catch2/catch.hpp" #include #include diff --git a/tests/AudioBufferT.cpp b/tests/AudioBufferT.cpp index ebd0b61d..88d7481e 100644 --- a/tests/AudioBufferT.cpp +++ b/tests/AudioBufferT.cpp @@ -21,8 +21,8 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "AudioBuffer.h" -#include "AudioSpan.h" +#include "sfizz/AudioBuffer.h" +#include "sfizz/AudioSpan.h" #include "catch2/catch.hpp" #include using namespace Catch::literals; diff --git a/tests/BufferT.cpp b/tests/BufferT.cpp index 873d39b9..a68de0d5 100644 --- a/tests/BufferT.cpp +++ b/tests/BufferT.cpp @@ -21,7 +21,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "Buffer.h" +#include "sfizz/Buffer.h" #include "catch2/catch.hpp" #include using namespace Catch::literals; diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d3e1511b..80a33d5a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -32,11 +32,8 @@ target_link_libraries(cnpy PUBLIC ZLIB::ZLIB) target_include_directories(cnpy PUBLIC cnpy) add_executable(sfizz_tests ${SFIZZ_TEST_SOURCES}) -target_link_libraries(sfizz_tests PRIVATE sfizz::sfizz) -sfizz_link_libsndfile(sfizz_tests) +target_link_libraries(sfizz_tests PRIVATE sfizz::sfizz cnpy) -target_link_libraries(sfizz_tests PRIVATE absl::strings absl::str_format absl::flat_hash_map cnpy absl::span absl::algorithm) -target_include_directories(sfizz_tests SYSTEM PRIVATE sources) -sfizz_enable_lto_if_needed(sfizz_tests) +# target_link_libraries(sfizz_tests PRIVATE absl::strings absl::str_format absl::flat_hash_map cnpy absl::span absl::algorithm) file(COPY "." DESTINATION ${CMAKE_BINARY_DIR}/tests) diff --git a/tests/EGDescriptionT.cpp b/tests/EGDescriptionT.cpp index aaceb179..87358e5c 100644 --- a/tests/EGDescriptionT.cpp +++ b/tests/EGDescriptionT.cpp @@ -22,7 +22,7 @@ // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "EGDescription.h" +#include "sfizz/EGDescription.h" #include "catch2/catch.hpp" using namespace Catch::literals; diff --git a/tests/EventEnvelopesT.cpp b/tests/EventEnvelopesT.cpp index 6c968f5c..31c33d82 100644 --- a/tests/EventEnvelopesT.cpp +++ b/tests/EventEnvelopesT.cpp @@ -21,9 +21,9 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "EventEnvelopes.h" -#include "SfzHelpers.h" -#include "Buffer.h" +#include "sfizz/EventEnvelopes.h" +#include "sfizz/SfzHelpers.h" +#include "sfizz/Buffer.h" #include "catch2/catch.hpp" #include #include diff --git a/tests/FilesT.cpp b/tests/FilesT.cpp index fb7db796..96457dd4 100644 --- a/tests/FilesT.cpp +++ b/tests/FilesT.cpp @@ -21,7 +21,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "Synth.h" +#include "sfizz/Synth.h" #include "catch2/catch.hpp" #include "ghc/fs_std.hpp" using namespace Catch::literals; diff --git a/tests/HelpersT.cpp b/tests/HelpersT.cpp index 07004b5a..c04e12ca 100644 --- a/tests/HelpersT.cpp +++ b/tests/HelpersT.cpp @@ -21,7 +21,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "StringViewHelpers.h" +#include "sfizz/StringViewHelpers.h" #include "catch2/catch.hpp" #include "absl/strings/string_view.h" using namespace Catch::literals; diff --git a/tests/MidiStateT.cpp b/tests/MidiStateT.cpp index 2104bfed..3e544601 100644 --- a/tests/MidiStateT.cpp +++ b/tests/MidiStateT.cpp @@ -27,7 +27,7 @@ * and SynthT.cpp. */ -#include "MidiState.h" +#include "sfizz/MidiState.h" #include "catch2/catch.hpp" #include "absl/strings/string_view.h" using namespace Catch::literals; diff --git a/tests/OnePoleFilterT.cpp b/tests/OnePoleFilterT.cpp index d4ffeaa1..04f5367e 100644 --- a/tests/OnePoleFilterT.cpp +++ b/tests/OnePoleFilterT.cpp @@ -21,7 +21,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "OnePoleFilter.h" +#include "sfizz/OnePoleFilter.h" #include "catch2/catch.hpp" #include "cnpy.h" #include "ghc/fs_std.hpp" diff --git a/tests/OpcodeT.cpp b/tests/OpcodeT.cpp index 6062fb47..9c106478 100644 --- a/tests/OpcodeT.cpp +++ b/tests/OpcodeT.cpp @@ -21,7 +21,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "Region.h" +#include "sfizz/Region.h" #include "catch2/catch.hpp" using namespace Catch::literals; diff --git a/tests/ParsingT.cpp b/tests/ParsingT.cpp index 8489738c..27daa43d 100644 --- a/tests/ParsingT.cpp +++ b/tests/ParsingT.cpp @@ -21,7 +21,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "SfzHelpers.h" +#include "sfizz/SfzHelpers.h" #include #include "catch2/catch.hpp" using namespace Catch::literals; diff --git a/tests/RangeT.cpp b/tests/RangeT.cpp index a7cbe16e..59673f92 100644 --- a/tests/RangeT.cpp +++ b/tests/RangeT.cpp @@ -21,7 +21,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "Range.h" +#include "sfizz/Range.h" #include "catch2/catch.hpp" using namespace Catch::literals; diff --git a/tests/RegionActivationT.cpp b/tests/RegionActivationT.cpp index b37398cd..3cec5ffb 100644 --- a/tests/RegionActivationT.cpp +++ b/tests/RegionActivationT.cpp @@ -21,7 +21,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "Region.h" +#include "sfizz/Region.h" #include "catch2/catch.hpp" using namespace Catch::literals; diff --git a/tests/RegionT.cpp b/tests/RegionT.cpp index 0a8ceb69..dc20a498 100644 --- a/tests/RegionT.cpp +++ b/tests/RegionT.cpp @@ -21,8 +21,8 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "MidiState.h" -#include "Region.h" +#include "sfizz/MidiState.h" +#include "sfizz/Region.h" #include "catch2/catch.hpp" using namespace Catch::literals; diff --git a/tests/RegionTriggersT.cpp b/tests/RegionTriggersT.cpp index 089f8d6d..2f0063c6 100644 --- a/tests/RegionTriggersT.cpp +++ b/tests/RegionTriggersT.cpp @@ -21,7 +21,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "Region.h" +#include "sfizz/Region.h" #include "catch2/catch.hpp" using namespace Catch::literals; diff --git a/tests/RegionValueComputationsT.cpp b/tests/RegionValueComputationsT.cpp index 617ea1d6..97ce8dc0 100644 --- a/tests/RegionValueComputationsT.cpp +++ b/tests/RegionValueComputationsT.cpp @@ -21,13 +21,13 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "Defaults.h" -#include "Region.h" +#include "sfizz/Defaults.h" +#include "sfizz/Region.h" +#include "sfizz/SfzHelpers.h" +#include "sfizz/MidiState.h" #include "catch2/catch.hpp" -#include #include #include -#include "MidiState.h" using namespace Catch::literals; constexpr int numRandomTests { 64 }; TEST_CASE("[Region] Crossfade in on key") diff --git a/tests/SIMDHelpersT.cpp b/tests/SIMDHelpersT.cpp index 8be6dec2..00893e66 100644 --- a/tests/SIMDHelpersT.cpp +++ b/tests/SIMDHelpersT.cpp @@ -21,7 +21,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "SIMDHelpers.h" +#include "sfizz/SIMDHelpers.h" #include "catch2/catch.hpp" #include #include diff --git a/tests/SynthT.cpp b/tests/SynthT.cpp index 999cf58c..1833c82d 100644 --- a/tests/SynthT.cpp +++ b/tests/SynthT.cpp @@ -21,7 +21,6 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "Config.h" #include "sfizz.hpp" #include "catch2/catch.hpp" using namespace Catch::literals;