diff --git a/.gitignore b/.gitignore index 9247450b..36d70bce 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,6 @@ /tests/_build/a.out /tests/_build/a.exe /tests/debugging/archive/ -/tests/test_stress/ /tests/*.c /tests/*.cpp /tools/_build/ @@ -46,6 +45,7 @@ /research/ma_hrtf.c /research/ma_atomic.c /research/miniaudio_engine.c +/tests/stress/ /tools/codegen/miniaudio_amalgamator.c /tools/codegen/miniaudio_codegen_utils.c /tools/codegen/miniaudio_docgen.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d41cbd4..88a27341 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -528,20 +528,20 @@ if(MINIAUDIO_BUILD_TESTS) # The debugging test is only used for debugging miniaudio itself. Don't do add_test() for this, and do not include it in in any automated testing. add_miniaudio_test(miniaudio_debugging debugging/debugging.cpp) - add_miniaudio_test(miniaudio_test_deviceio test_deviceio/ma_test_deviceio.c) - add_test(NAME miniaudio_test_deviceio COMMAND miniaudio_test_deviceio --auto) + add_miniaudio_test(miniaudio_deviceio deviceio/deviceio.c) + add_test(NAME miniaudio_deviceio COMMAND miniaudio_deviceio --auto) - add_miniaudio_test(miniaudio_test_cpp test_cpp/ma_test_cpp.cpp) - add_test(NAME miniaudio_test_cpp COMMAND miniaudio_test_cpp --auto) # This is just the deviceio test. + add_miniaudio_test(miniaudio_cpp cpp/cpp.cpp) + add_test(NAME miniaudio_cpp COMMAND miniaudio_cpp --auto) # This is just the deviceio test. - add_miniaudio_test(miniaudio_test_automated test_automated/ma_test_automated.c) - add_test(NAME miniaudio_test_automated COMMAND miniaudio_test_automated) + add_miniaudio_test(miniaudio_conversion conversion/conversion.c) + add_test(NAME miniaudio_conversion COMMAND miniaudio_conversion) - add_miniaudio_test(miniaudio_test_filtering test_filtering/ma_test_filtering.c) - add_test(NAME miniaudio_test_filtering COMMAND miniaudio_test_filtering ${CMAKE_CURRENT_SOURCE_DIR}/data/16-44100-stereo.flac) + add_miniaudio_test(miniaudio_filtering filtering/filtering.c) + add_test(NAME miniaudio_filtering COMMAND miniaudio_filtering ${CMAKE_CURRENT_SOURCE_DIR}/data/16-44100-stereo.flac) - add_miniaudio_test(miniaudio_test_generation test_generation/ma_test_generation.c) - add_test(NAME miniaudio_test_generation COMMAND miniaudio_test_generation) + add_miniaudio_test(miniaudio_generation generation/generation.c) + add_test(NAME miniaudio_generation COMMAND miniaudio_generation) endif() # Examples diff --git a/tests/test_automated/ma_test_automated.c b/tests/conversion/conversion.c similarity index 100% rename from tests/test_automated/ma_test_automated.c rename to tests/conversion/conversion.c diff --git a/tests/test_automated/ma_test_automated_data_converter.c b/tests/conversion/ma_test_automated_data_converter.c similarity index 100% rename from tests/test_automated/ma_test_automated_data_converter.c rename to tests/conversion/ma_test_automated_data_converter.c diff --git a/tests/cpp/cpp.cpp b/tests/cpp/cpp.cpp new file mode 100644 index 00000000..cc1c63b6 --- /dev/null +++ b/tests/cpp/cpp.cpp @@ -0,0 +1 @@ +#include "../deviceio/deviceio.c" diff --git a/tests/test_deviceio/ma_test_deviceio.c b/tests/deviceio/deviceio.c similarity index 100% rename from tests/test_deviceio/ma_test_deviceio.c rename to tests/deviceio/deviceio.c diff --git a/tests/test_emscripten/ma_test_emscripten.c b/tests/emscripten/emscripten.c similarity index 100% rename from tests/test_emscripten/ma_test_emscripten.c rename to tests/emscripten/emscripten.c diff --git a/tests/test_emscripten/ma_test_emscripten.html b/tests/emscripten/emscripten.html similarity index 100% rename from tests/test_emscripten/ma_test_emscripten.html rename to tests/emscripten/emscripten.html diff --git a/tests/test_filtering/ma_test_filtering.c b/tests/filtering/filtering.c similarity index 100% rename from tests/test_filtering/ma_test_filtering.c rename to tests/filtering/filtering.c diff --git a/tests/test_filtering/ma_test_filtering_bpf.c b/tests/filtering/ma_test_filtering_bpf.c similarity index 100% rename from tests/test_filtering/ma_test_filtering_bpf.c rename to tests/filtering/ma_test_filtering_bpf.c diff --git a/tests/test_filtering/ma_test_filtering_dithering.c b/tests/filtering/ma_test_filtering_dithering.c similarity index 100% rename from tests/test_filtering/ma_test_filtering_dithering.c rename to tests/filtering/ma_test_filtering_dithering.c diff --git a/tests/test_filtering/ma_test_filtering_hishelf.c b/tests/filtering/ma_test_filtering_hishelf.c similarity index 100% rename from tests/test_filtering/ma_test_filtering_hishelf.c rename to tests/filtering/ma_test_filtering_hishelf.c diff --git a/tests/test_filtering/ma_test_filtering_hpf.c b/tests/filtering/ma_test_filtering_hpf.c similarity index 100% rename from tests/test_filtering/ma_test_filtering_hpf.c rename to tests/filtering/ma_test_filtering_hpf.c diff --git a/tests/test_filtering/ma_test_filtering_loshelf.c b/tests/filtering/ma_test_filtering_loshelf.c similarity index 100% rename from tests/test_filtering/ma_test_filtering_loshelf.c rename to tests/filtering/ma_test_filtering_loshelf.c diff --git a/tests/test_filtering/ma_test_filtering_lpf.c b/tests/filtering/ma_test_filtering_lpf.c similarity index 100% rename from tests/test_filtering/ma_test_filtering_lpf.c rename to tests/filtering/ma_test_filtering_lpf.c diff --git a/tests/test_filtering/ma_test_filtering_notch.c b/tests/filtering/ma_test_filtering_notch.c similarity index 100% rename from tests/test_filtering/ma_test_filtering_notch.c rename to tests/filtering/ma_test_filtering_notch.c diff --git a/tests/test_filtering/ma_test_filtering_peak.c b/tests/filtering/ma_test_filtering_peak.c similarity index 100% rename from tests/test_filtering/ma_test_filtering_peak.c rename to tests/filtering/ma_test_filtering_peak.c diff --git a/tests/test_generation/ma_test_generation.c b/tests/generation/generation.c similarity index 100% rename from tests/test_generation/ma_test_generation.c rename to tests/generation/generation.c diff --git a/tests/test_generation/ma_test_generation_noise.c b/tests/generation/ma_test_generation_noise.c similarity index 100% rename from tests/test_generation/ma_test_generation_noise.c rename to tests/generation/ma_test_generation_noise.c diff --git a/tests/test_generation/ma_test_generation_waveform.c b/tests/generation/ma_test_generation_waveform.c similarity index 100% rename from tests/test_generation/ma_test_generation_waveform.c rename to tests/generation/ma_test_generation_waveform.c diff --git a/tests/test_cpp/ma_test_cpp.cpp b/tests/test_cpp/ma_test_cpp.cpp deleted file mode 100644 index a20bd977..00000000 --- a/tests/test_cpp/ma_test_cpp.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "../test_deviceio/ma_test_deviceio.c"