From c79eebd050c821011928723c56bc882035949926 Mon Sep 17 00:00:00 2001 From: David Reid Date: Tue, 3 Mar 2020 20:47:24 +1000 Subject: [PATCH] Rearrange directory structure. --- .gitignore | 26 +++------- tests/README.md | 22 ++------ .../benchmarks/pcm_f32_to_f32__mono_8000.raw | Bin .../benchmarks/pcm_f32_to_s16__mono_8000.raw | Bin .../benchmarks/pcm_f32_to_s24__mono_8000.raw | Bin .../benchmarks/pcm_f32_to_s32__mono_8000.raw | Bin .../benchmarks/pcm_f32_to_u8__mono_8000.raw | 0 .../benchmarks/pcm_s16_to_f32__mono_8000.raw | Bin .../benchmarks/pcm_s16_to_s16__mono_8000.raw | Bin .../benchmarks/pcm_s16_to_s24__mono_8000.raw | Bin .../benchmarks/pcm_s16_to_s32__mono_8000.raw | Bin .../benchmarks/pcm_s16_to_u8__mono_8000.raw | 0 .../benchmarks/pcm_s24_to_f32__mono_8000.raw | Bin .../benchmarks/pcm_s24_to_s16__mono_8000.raw | Bin .../benchmarks/pcm_s24_to_s24__mono_8000.raw | Bin .../benchmarks/pcm_s24_to_s32__mono_8000.raw | Bin .../benchmarks/pcm_s24_to_u8__mono_8000.raw | 0 .../benchmarks/pcm_s32_to_f32__mono_8000.raw | Bin .../benchmarks/pcm_s32_to_s16__mono_8000.raw | Bin .../benchmarks/pcm_s32_to_s24__mono_8000.raw | Bin .../benchmarks/pcm_s32_to_s32__mono_8000.raw | Bin .../benchmarks/pcm_s32_to_u8__mono_8000.raw | 0 .../benchmarks/pcm_u8_to_f32__mono_8000.raw | Bin .../benchmarks/pcm_u8_to_s16__mono_8000.raw | Bin .../benchmarks/pcm_u8_to_s24__mono_8000.raw | Bin .../benchmarks/pcm_u8_to_s32__mono_8000.raw | Bin .../benchmarks/pcm_u8_to_u8__mono_8000.raw | 0 .../_build/{bin => res}/output/DO_NOT_DELETE | 0 .../{ => _build}/res/sine_s16_mono_48000.wav | Bin tests/res/output/DO_NOT_DELETE | 0 tests/test_common/ma_test_common.c | 3 +- tests/test_filtering/ma_test_filtering_bpf.c | 8 +-- .../ma_test_filtering_dithering.c | 2 +- .../ma_test_filtering_hishelf.c | 8 +-- tests/test_filtering/ma_test_filtering_hpf.c | 12 ++--- .../ma_test_filtering_loshelf.c | 8 +-- tests/test_filtering/ma_test_filtering_lpf.c | 12 ++--- .../test_filtering/ma_test_filtering_notch.c | 8 +-- tests/test_filtering/ma_test_filtering_peak.c | 8 +-- .../ma_test_generation_noise.c | 19 ++++--- .../ma_test_generation_waveform.c | 48 +++++++++--------- 41 files changed, 79 insertions(+), 105 deletions(-) rename tests/{ => _build}/res/benchmarks/pcm_f32_to_f32__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_f32_to_s16__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_f32_to_s24__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_f32_to_s32__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_f32_to_u8__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_s16_to_f32__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_s16_to_s16__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_s16_to_s24__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_s16_to_s32__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_s16_to_u8__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_s24_to_f32__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_s24_to_s16__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_s24_to_s24__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_s24_to_s32__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_s24_to_u8__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_s32_to_f32__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_s32_to_s16__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_s32_to_s24__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_s32_to_s32__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_s32_to_u8__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_u8_to_f32__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_u8_to_s16__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_u8_to_s24__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_u8_to_s32__mono_8000.raw (100%) rename tests/{ => _build}/res/benchmarks/pcm_u8_to_u8__mono_8000.raw (100%) rename tests/_build/{bin => res}/output/DO_NOT_DELETE (100%) rename tests/{ => _build}/res/sine_s16_mono_48000.wav (100%) delete mode 100644 tests/res/output/DO_NOT_DELETE diff --git a/.gitignore b/.gitignore index 52e0a59e..bcbef240 100644 --- a/.gitignore +++ b/.gitignore @@ -1,22 +1,10 @@ -examples/out/ -docs/ -debugging/ -old_stuff/ -res/ -tests/x64/ -tests/Debug/ -tests/Release/ -tests/ARM/ -tests/bin/ +_private/ +examples/build/vc15/ +examples/build/bin/ +tests/_build/bin/ +tests/_build/res/output/ tests/_build/tcc/ -!/tests/bin/DO_NOT_DELETE -tests/res/output/ -!/tests/res/output/DO_NOT_DELETE -/tests/SDL2.dll -tests/res/private/ -tests/private/ -examples/bin/ -examples/res/private/ -/examples/SDL2.dll +tests/_build/vc15/ +tools/_build/ *.vcxproj.user .vs/ \ No newline at end of file diff --git a/tests/README.md b/tests/README.md index 803f6036..57a20bb0 100644 --- a/tests/README.md +++ b/tests/README.md @@ -1,22 +1,8 @@ Building ======== -Build and run these test from this folder. Example: +Build and run from this directory. Example: - clear && ./ma_build_tests_linux && ./bin/ma_test_0 + gcc ../test_deviceio.c -o bin/test_deviceio + ./bin/test_deviceio -These tests load resources from hard coded paths which point to the "res" folder. These -paths are based on the assumption that the current directory is where the build files -are located. - -Emscripten ----------- -On Windows, you need to move into this directory and run emsdk_env.bat from a command -prompt using an absolute path like "C:\emsdk\emsdk_env.bat". Note that PowerShell doesn't -work for me for some reason. Then, run the relevant batch file: - - ma_build_tests_emscripten.bat - -The output will be placed in the bin folder. If you have output WASM it may not work when -running the web page locally. To test you can run with something like this: - - emrun bin/ma_test_0_emscripten.html \ No newline at end of file +Output files will be placed in the "res/output" folder. diff --git a/tests/res/benchmarks/pcm_f32_to_f32__mono_8000.raw b/tests/_build/res/benchmarks/pcm_f32_to_f32__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_f32_to_f32__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_f32_to_f32__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_f32_to_s16__mono_8000.raw b/tests/_build/res/benchmarks/pcm_f32_to_s16__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_f32_to_s16__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_f32_to_s16__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_f32_to_s24__mono_8000.raw b/tests/_build/res/benchmarks/pcm_f32_to_s24__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_f32_to_s24__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_f32_to_s24__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_f32_to_s32__mono_8000.raw b/tests/_build/res/benchmarks/pcm_f32_to_s32__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_f32_to_s32__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_f32_to_s32__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_f32_to_u8__mono_8000.raw b/tests/_build/res/benchmarks/pcm_f32_to_u8__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_f32_to_u8__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_f32_to_u8__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_s16_to_f32__mono_8000.raw b/tests/_build/res/benchmarks/pcm_s16_to_f32__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_s16_to_f32__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_s16_to_f32__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_s16_to_s16__mono_8000.raw b/tests/_build/res/benchmarks/pcm_s16_to_s16__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_s16_to_s16__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_s16_to_s16__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_s16_to_s24__mono_8000.raw b/tests/_build/res/benchmarks/pcm_s16_to_s24__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_s16_to_s24__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_s16_to_s24__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_s16_to_s32__mono_8000.raw b/tests/_build/res/benchmarks/pcm_s16_to_s32__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_s16_to_s32__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_s16_to_s32__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_s16_to_u8__mono_8000.raw b/tests/_build/res/benchmarks/pcm_s16_to_u8__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_s16_to_u8__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_s16_to_u8__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_s24_to_f32__mono_8000.raw b/tests/_build/res/benchmarks/pcm_s24_to_f32__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_s24_to_f32__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_s24_to_f32__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_s24_to_s16__mono_8000.raw b/tests/_build/res/benchmarks/pcm_s24_to_s16__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_s24_to_s16__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_s24_to_s16__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_s24_to_s24__mono_8000.raw b/tests/_build/res/benchmarks/pcm_s24_to_s24__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_s24_to_s24__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_s24_to_s24__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_s24_to_s32__mono_8000.raw b/tests/_build/res/benchmarks/pcm_s24_to_s32__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_s24_to_s32__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_s24_to_s32__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_s24_to_u8__mono_8000.raw b/tests/_build/res/benchmarks/pcm_s24_to_u8__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_s24_to_u8__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_s24_to_u8__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_s32_to_f32__mono_8000.raw b/tests/_build/res/benchmarks/pcm_s32_to_f32__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_s32_to_f32__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_s32_to_f32__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_s32_to_s16__mono_8000.raw b/tests/_build/res/benchmarks/pcm_s32_to_s16__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_s32_to_s16__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_s32_to_s16__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_s32_to_s24__mono_8000.raw b/tests/_build/res/benchmarks/pcm_s32_to_s24__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_s32_to_s24__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_s32_to_s24__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_s32_to_s32__mono_8000.raw b/tests/_build/res/benchmarks/pcm_s32_to_s32__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_s32_to_s32__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_s32_to_s32__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_s32_to_u8__mono_8000.raw b/tests/_build/res/benchmarks/pcm_s32_to_u8__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_s32_to_u8__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_s32_to_u8__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_u8_to_f32__mono_8000.raw b/tests/_build/res/benchmarks/pcm_u8_to_f32__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_u8_to_f32__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_u8_to_f32__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_u8_to_s16__mono_8000.raw b/tests/_build/res/benchmarks/pcm_u8_to_s16__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_u8_to_s16__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_u8_to_s16__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_u8_to_s24__mono_8000.raw b/tests/_build/res/benchmarks/pcm_u8_to_s24__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_u8_to_s24__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_u8_to_s24__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_u8_to_s32__mono_8000.raw b/tests/_build/res/benchmarks/pcm_u8_to_s32__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_u8_to_s32__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_u8_to_s32__mono_8000.raw diff --git a/tests/res/benchmarks/pcm_u8_to_u8__mono_8000.raw b/tests/_build/res/benchmarks/pcm_u8_to_u8__mono_8000.raw similarity index 100% rename from tests/res/benchmarks/pcm_u8_to_u8__mono_8000.raw rename to tests/_build/res/benchmarks/pcm_u8_to_u8__mono_8000.raw diff --git a/tests/_build/bin/output/DO_NOT_DELETE b/tests/_build/res/output/DO_NOT_DELETE similarity index 100% rename from tests/_build/bin/output/DO_NOT_DELETE rename to tests/_build/res/output/DO_NOT_DELETE diff --git a/tests/res/sine_s16_mono_48000.wav b/tests/_build/res/sine_s16_mono_48000.wav similarity index 100% rename from tests/res/sine_s16_mono_48000.wav rename to tests/_build/res/sine_s16_mono_48000.wav diff --git a/tests/res/output/DO_NOT_DELETE b/tests/res/output/DO_NOT_DELETE deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/test_common/ma_test_common.c b/tests/test_common/ma_test_common.c index d9f10181..21f1c8b0 100644 --- a/tests/test_common/ma_test_common.c +++ b/tests/test_common/ma_test_common.c @@ -10,7 +10,8 @@ #include -#define MAX_TESTS 64 +#define MAX_TESTS 64 +#define TEST_OUTPUT_DIR "res/output" typedef int (* ma_test_entry_proc)(int argc, char** argv); diff --git a/tests/test_filtering/ma_test_filtering_bpf.c b/tests/test_filtering/ma_test_filtering_bpf.c index 2d761725..77ffc858 100644 --- a/tests/test_filtering/ma_test_filtering_bpf.c +++ b/tests/test_filtering/ma_test_filtering_bpf.c @@ -56,12 +56,12 @@ ma_result test_bpf2__by_format(const char* pInputFilePath, const char* pOutputFi ma_result test_bpf2__f32(const char* pInputFilePath) { - return test_bpf2__by_format(pInputFilePath, "output/bpf2_f32.wav", ma_format_f32); + return test_bpf2__by_format(pInputFilePath, TEST_OUTPUT_DIR"/bpf2_f32.wav", ma_format_f32); } ma_result test_bpf2__s16(const char* pInputFilePath) { - return test_bpf2__by_format(pInputFilePath, "output/bpf2_s16.wav", ma_format_s16); + return test_bpf2__by_format(pInputFilePath, TEST_OUTPUT_DIR"/bpf2_s16.wav", ma_format_s16); } @@ -117,12 +117,12 @@ ma_result test_bpf4__by_format(const char* pInputFilePath, const char* pOutputFi ma_result test_bpf4__f32(const char* pInputFilePath) { - return test_bpf4__by_format(pInputFilePath, "output/bpf4_f32.wav", ma_format_f32); + return test_bpf4__by_format(pInputFilePath, TEST_OUTPUT_DIR"/bpf4_f32.wav", ma_format_f32); } ma_result test_bpf4__s16(const char* pInputFilePath) { - return test_bpf4__by_format(pInputFilePath, "output/bpf4_s16.wav", ma_format_s16); + return test_bpf4__by_format(pInputFilePath, TEST_OUTPUT_DIR"/bpf4_s16.wav", ma_format_s16); } diff --git a/tests/test_filtering/ma_test_filtering_dithering.c b/tests/test_filtering/ma_test_filtering_dithering.c index 6ba962a0..9fd579e2 100644 --- a/tests/test_filtering/ma_test_filtering_dithering.c +++ b/tests/test_filtering/ma_test_filtering_dithering.c @@ -1,7 +1,7 @@ ma_result test_dithering__u8(const char* pInputFilePath) { - const char* pOutputFilePath = "output/dithering_u8.wav"; + const char* pOutputFilePath = TEST_OUTPUT_DIR"/dithering_u8.wav"; ma_result result; ma_decoder_config decoderConfig; ma_decoder decoder; diff --git a/tests/test_filtering/ma_test_filtering_hishelf.c b/tests/test_filtering/ma_test_filtering_hishelf.c index f01c19ce..d1d81133 100644 --- a/tests/test_filtering/ma_test_filtering_hishelf.c +++ b/tests/test_filtering/ma_test_filtering_hishelf.c @@ -56,12 +56,12 @@ ma_result test_hishelf2__by_format(const char* pInputFilePath, const char* pOutp ma_result test_hishelf2__f32(const char* pInputFilePath) { - return test_hishelf2__by_format(pInputFilePath, "output/hishelf2_f32.wav", ma_format_f32); + return test_hishelf2__by_format(pInputFilePath, TEST_OUTPUT_DIR"/hishelf2_f32.wav", ma_format_f32); } ma_result test_hishelf2__s16(const char* pInputFilePath) { - return test_hishelf2__by_format(pInputFilePath, "output/hishelf2_s16.wav", ma_format_s16); + return test_hishelf2__by_format(pInputFilePath, TEST_OUTPUT_DIR"/hishelf2_s16.wav", ma_format_s16); } #if 0 @@ -117,12 +117,12 @@ ma_result test_hishelf4__by_format(const char* pInputFilePath, const char* pOutp ma_result test_hishelf4__f32(const char* pInputFilePath) { - return test_hishelf4__by_format(pInputFilePath, "output/hishelf4_f32.wav", ma_format_f32); + return test_hishelf4__by_format(pInputFilePath, TEST_OUTPUT_DIR"/hishelf4_f32.wav", ma_format_f32); } ma_result test_hishelf4__s16(const char* pInputFilePath) { - return test_hishelf4__by_format(pInputFilePath, "output/hishelf4_s16.wav", ma_format_s16); + return test_hishelf4__by_format(pInputFilePath, TEST_OUTPUT_DIR"/hishelf4_s16.wav", ma_format_s16); } #endif diff --git a/tests/test_filtering/ma_test_filtering_hpf.c b/tests/test_filtering/ma_test_filtering_hpf.c index bac28e2b..39f5a2bf 100644 --- a/tests/test_filtering/ma_test_filtering_hpf.c +++ b/tests/test_filtering/ma_test_filtering_hpf.c @@ -56,12 +56,12 @@ ma_result test_hpf1__by_format(const char* pInputFilePath, const char* pOutputFi ma_result test_hpf1__f32(const char* pInputFilePath) { - return test_hpf1__by_format(pInputFilePath, "output/hpf1_f32.wav", ma_format_f32); + return test_hpf1__by_format(pInputFilePath, TEST_OUTPUT_DIR"/hpf1_f32.wav", ma_format_f32); } ma_result test_hpf1__s16(const char* pInputFilePath) { - return test_hpf1__by_format(pInputFilePath, "output/hpf1_s16.wav", ma_format_s16); + return test_hpf1__by_format(pInputFilePath, TEST_OUTPUT_DIR"/hpf1_s16.wav", ma_format_s16); } @@ -117,12 +117,12 @@ ma_result test_hpf2__by_format(const char* pInputFilePath, const char* pOutputFi ma_result test_hpf2__f32(const char* pInputFilePath) { - return test_hpf2__by_format(pInputFilePath, "output/hpf2_f32.wav", ma_format_f32); + return test_hpf2__by_format(pInputFilePath, TEST_OUTPUT_DIR"/hpf2_f32.wav", ma_format_f32); } ma_result test_hpf2__s16(const char* pInputFilePath) { - return test_hpf2__by_format(pInputFilePath, "output/hpf2_s16.wav", ma_format_s16); + return test_hpf2__by_format(pInputFilePath, TEST_OUTPUT_DIR"/hpf2_s16.wav", ma_format_s16); } @@ -178,12 +178,12 @@ ma_result test_hpf3__by_format(const char* pInputFilePath, const char* pOutputFi ma_result test_hpf3__f32(const char* pInputFilePath) { - return test_hpf3__by_format(pInputFilePath, "output/hpf3_f32.wav", ma_format_f32); + return test_hpf3__by_format(pInputFilePath, TEST_OUTPUT_DIR"/hpf3_f32.wav", ma_format_f32); } ma_result test_hpf3__s16(const char* pInputFilePath) { - return test_hpf3__by_format(pInputFilePath, "output/hpf3_s16.wav", ma_format_s16); + return test_hpf3__by_format(pInputFilePath, TEST_OUTPUT_DIR"/hpf3_s16.wav", ma_format_s16); } diff --git a/tests/test_filtering/ma_test_filtering_loshelf.c b/tests/test_filtering/ma_test_filtering_loshelf.c index efba93af..6d8dd455 100644 --- a/tests/test_filtering/ma_test_filtering_loshelf.c +++ b/tests/test_filtering/ma_test_filtering_loshelf.c @@ -56,12 +56,12 @@ ma_result test_loshelf2__by_format(const char* pInputFilePath, const char* pOutp ma_result test_loshelf2__f32(const char* pInputFilePath) { - return test_loshelf2__by_format(pInputFilePath, "output/loshelf2_f32.wav", ma_format_f32); + return test_loshelf2__by_format(pInputFilePath, TEST_OUTPUT_DIR"/loshelf2_f32.wav", ma_format_f32); } ma_result test_loshelf2__s16(const char* pInputFilePath) { - return test_loshelf2__by_format(pInputFilePath, "output/loshelf2_s16.wav", ma_format_s16); + return test_loshelf2__by_format(pInputFilePath, TEST_OUTPUT_DIR"/loshelf2_s16.wav", ma_format_s16); } #if 0 @@ -117,12 +117,12 @@ ma_result test_loshelf4__by_format(const char* pInputFilePath, const char* pOutp ma_result test_loshelf4__f32(const char* pInputFilePath) { - return test_loshelf4__by_format(pInputFilePath, "output/loshelf4_f32.wav", ma_format_f32); + return test_loshelf4__by_format(pInputFilePath, TEST_OUTPUT_DIR"/loshelf4_f32.wav", ma_format_f32); } ma_result test_loshelf4__s16(const char* pInputFilePath) { - return test_loshelf4__by_format(pInputFilePath, "output/loshelf4_s16.wav", ma_format_s16); + return test_loshelf4__by_format(pInputFilePath, TEST_OUTPUT_DIR"/loshelf4_s16.wav", ma_format_s16); } #endif diff --git a/tests/test_filtering/ma_test_filtering_lpf.c b/tests/test_filtering/ma_test_filtering_lpf.c index 66060f75..6fe5c2a4 100644 --- a/tests/test_filtering/ma_test_filtering_lpf.c +++ b/tests/test_filtering/ma_test_filtering_lpf.c @@ -56,12 +56,12 @@ ma_result test_lpf1__by_format(const char* pInputFilePath, const char* pOutputFi ma_result test_lpf1__f32(const char* pInputFilePath) { - return test_lpf1__by_format(pInputFilePath, "output/lpf1_f32.wav", ma_format_f32); + return test_lpf1__by_format(pInputFilePath, TEST_OUTPUT_DIR"/lpf1_f32.wav", ma_format_f32); } ma_result test_lpf1__s16(const char* pInputFilePath) { - return test_lpf1__by_format(pInputFilePath, "output/lpf1_s16.wav", ma_format_s16); + return test_lpf1__by_format(pInputFilePath, TEST_OUTPUT_DIR"/lpf1_s16.wav", ma_format_s16); } @@ -117,12 +117,12 @@ ma_result test_lpf2__by_format(const char* pInputFilePath, const char* pOutputFi ma_result test_lpf2__f32(const char* pInputFilePath) { - return test_lpf2__by_format(pInputFilePath, "output/lpf2_f32.wav", ma_format_f32); + return test_lpf2__by_format(pInputFilePath, TEST_OUTPUT_DIR"/lpf2_f32.wav", ma_format_f32); } ma_result test_lpf2__s16(const char* pInputFilePath) { - return test_lpf2__by_format(pInputFilePath, "output/lpf2_s16.wav", ma_format_s16); + return test_lpf2__by_format(pInputFilePath, TEST_OUTPUT_DIR"/lpf2_s16.wav", ma_format_s16); } @@ -179,12 +179,12 @@ ma_result test_lpf3__by_format(const char* pInputFilePath, const char* pOutputFi ma_result test_lpf3__f32(const char* pInputFilePath) { - return test_lpf3__by_format(pInputFilePath, "output/lpf3_f32.wav", ma_format_f32); + return test_lpf3__by_format(pInputFilePath, TEST_OUTPUT_DIR"/lpf3_f32.wav", ma_format_f32); } ma_result test_lpf3__s16(const char* pInputFilePath) { - return test_lpf3__by_format(pInputFilePath, "output/lpf3_s16.wav", ma_format_s16); + return test_lpf3__by_format(pInputFilePath, TEST_OUTPUT_DIR"/lpf3_s16.wav", ma_format_s16); } diff --git a/tests/test_filtering/ma_test_filtering_notch.c b/tests/test_filtering/ma_test_filtering_notch.c index b3f8e9be..af80422c 100644 --- a/tests/test_filtering/ma_test_filtering_notch.c +++ b/tests/test_filtering/ma_test_filtering_notch.c @@ -56,12 +56,12 @@ ma_result test_notch2__by_format(const char* pInputFilePath, const char* pOutput ma_result test_notch2__f32(const char* pInputFilePath) { - return test_notch2__by_format(pInputFilePath, "output/notch2_f32.wav", ma_format_f32); + return test_notch2__by_format(pInputFilePath, TEST_OUTPUT_DIR"/notch2_f32.wav", ma_format_f32); } ma_result test_notch2__s16(const char* pInputFilePath) { - return test_notch2__by_format(pInputFilePath, "output/notch2_s16.wav", ma_format_s16); + return test_notch2__by_format(pInputFilePath, TEST_OUTPUT_DIR"/notch2_s16.wav", ma_format_s16); } #if 0 @@ -117,12 +117,12 @@ ma_result test_notch4__by_format(const char* pInputFilePath, const char* pOutput ma_result test_notch4__f32(const char* pInputFilePath) { - return test_notch4__by_format(pInputFilePath, "output/notch4_f32.wav", ma_format_f32); + return test_notch4__by_format(pInputFilePath, TEST_OUTPUT_DIR"/notch4_f32.wav", ma_format_f32); } ma_result test_notch4__s16(const char* pInputFilePath) { - return test_notch4__by_format(pInputFilePath, "output/notch4_s16.wav", ma_format_s16); + return test_notch4__by_format(pInputFilePath, TEST_OUTPUT_DIR"/notch4_s16.wav", ma_format_s16); } #endif diff --git a/tests/test_filtering/ma_test_filtering_peak.c b/tests/test_filtering/ma_test_filtering_peak.c index 7d3181b3..bd50da26 100644 --- a/tests/test_filtering/ma_test_filtering_peak.c +++ b/tests/test_filtering/ma_test_filtering_peak.c @@ -56,12 +56,12 @@ ma_result test_peak2__by_format(const char* pInputFilePath, const char* pOutputF ma_result test_peak2__f32(const char* pInputFilePath) { - return test_peak2__by_format(pInputFilePath, "output/peak2_f32.wav", ma_format_f32); + return test_peak2__by_format(pInputFilePath, TEST_OUTPUT_DIR"/peak2_f32.wav", ma_format_f32); } ma_result test_peak2__s16(const char* pInputFilePath) { - return test_peak2__by_format(pInputFilePath, "output/peak2_s16.wav", ma_format_s16); + return test_peak2__by_format(pInputFilePath, TEST_OUTPUT_DIR"/peak2_s16.wav", ma_format_s16); } #if 0 @@ -117,12 +117,12 @@ ma_result test_peak4__by_format(const char* pInputFilePath, const char* pOutputF ma_result test_peak4__f32(const char* pInputFilePath) { - return test_peak4__by_format(pInputFilePath, "output/peak4_f32.wav", ma_format_f32); + return test_peak4__by_format(pInputFilePath, TEST_OUTPUT_DIR"/peak4_f32.wav", ma_format_f32); } ma_result test_peak4__s16(const char* pInputFilePath) { - return test_peak4__by_format(pInputFilePath, "output/peak4_s16.wav", ma_format_s16); + return test_peak4__by_format(pInputFilePath, TEST_OUTPUT_DIR"/peak4_s16.wav", ma_format_s16); } #endif diff --git a/tests/test_generation/ma_test_generation_noise.c b/tests/test_generation/ma_test_generation_noise.c index 991fccc1..b2ae5c20 100644 --- a/tests/test_generation/ma_test_generation_noise.c +++ b/tests/test_generation/ma_test_generation_noise.c @@ -1,5 +1,4 @@ - ma_result test_noise__by_format_and_type(ma_format format, ma_waveform_type type, const char* pFileName) { ma_result result; @@ -39,17 +38,17 @@ ma_result test_noise__f32() ma_result result; ma_bool32 hasError = MA_FALSE; - result = test_noise__by_format_and_type(ma_format_f32, ma_noise_type_white, "output/noise_f32_white.wav"); + result = test_noise__by_format_and_type(ma_format_f32, ma_noise_type_white, TEST_OUTPUT_DIR"/noise_f32_white.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } - result = test_noise__by_format_and_type(ma_format_f32, ma_noise_type_pink, "output/noise_f32_pink.wav"); + result = test_noise__by_format_and_type(ma_format_f32, ma_noise_type_pink, TEST_OUTPUT_DIR"/noise_f32_pink.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } - result = test_noise__by_format_and_type(ma_format_f32, ma_noise_type_brownian, "output/noise_f32_brownian.wav"); + result = test_noise__by_format_and_type(ma_format_f32, ma_noise_type_brownian, TEST_OUTPUT_DIR"/noise_f32_brownian.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } @@ -66,17 +65,17 @@ ma_result test_noise__s16() ma_result result; ma_bool32 hasError = MA_FALSE; - result = test_noise__by_format_and_type(ma_format_s16, ma_noise_type_white, "output/noise_s16_white.wav"); + result = test_noise__by_format_and_type(ma_format_s16, ma_noise_type_white, TEST_OUTPUT_DIR"/output/noise_s16_white.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } - result = test_noise__by_format_and_type(ma_format_s16, ma_noise_type_pink, "output/noise_s16_pink.wav"); + result = test_noise__by_format_and_type(ma_format_s16, ma_noise_type_pink, TEST_OUTPUT_DIR"/output/noise_s16_pink.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } - result = test_noise__by_format_and_type(ma_format_s16, ma_noise_type_brownian, "output/noise_s16_brownian.wav"); + result = test_noise__by_format_and_type(ma_format_s16, ma_noise_type_brownian, TEST_OUTPUT_DIR"/output/noise_s16_brownian.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } @@ -93,17 +92,17 @@ ma_result test_noise__u8() ma_result result; ma_bool32 hasError = MA_FALSE; - result = test_noise__by_format_and_type(ma_format_u8, ma_noise_type_white, "output/noise_u8_white.wav"); + result = test_noise__by_format_and_type(ma_format_u8, ma_noise_type_white, TEST_OUTPUT_DIR"/noise_u8_white.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } - result = test_noise__by_format_and_type(ma_format_u8, ma_noise_type_pink, "output/noise_u8_pink.wav"); + result = test_noise__by_format_and_type(ma_format_u8, ma_noise_type_pink, TEST_OUTPUT_DIR"/noise_u8_pink.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } - result = test_noise__by_format_and_type(ma_format_u8, ma_noise_type_brownian, "output/noise_u8_brownian.wav"); + result = test_noise__by_format_and_type(ma_format_u8, ma_noise_type_brownian, TEST_OUTPUT_DIR"/noise_u8_brownian.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } diff --git a/tests/test_generation/ma_test_generation_waveform.c b/tests/test_generation/ma_test_generation_waveform.c index fc662aea..bf1f314d 100644 --- a/tests/test_generation/ma_test_generation_waveform.c +++ b/tests/test_generation/ma_test_generation_waveform.c @@ -46,45 +46,45 @@ ma_result test_waveform__f32() double amplitude = 0.2; /* Sine */ - result = test_waveform__by_format_and_type(ma_format_f32, ma_waveform_type_sine, +amplitude, "output/waveform_f32_sine.wav"); + result = test_waveform__by_format_and_type(ma_format_f32, ma_waveform_type_sine, +amplitude, TEST_OUTPUT_DIR"/waveform_f32_sine.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } - result = test_waveform__by_format_and_type(ma_format_f32, ma_waveform_type_sine, -amplitude, "output/waveform_f32_sine_neg.wav"); + result = test_waveform__by_format_and_type(ma_format_f32, ma_waveform_type_sine, -amplitude, TEST_OUTPUT_DIR"/waveform_f32_sine_neg.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } /* Square */ - result = test_waveform__by_format_and_type(ma_format_f32, ma_waveform_type_square, +amplitude, "output/waveform_f32_square.wav"); + result = test_waveform__by_format_and_type(ma_format_f32, ma_waveform_type_square, +amplitude, TEST_OUTPUT_DIR"/waveform_f32_square.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } - result = test_waveform__by_format_and_type(ma_format_f32, ma_waveform_type_square, -amplitude, "output/waveform_f32_square_neg.wav"); + result = test_waveform__by_format_and_type(ma_format_f32, ma_waveform_type_square, -amplitude, TEST_OUTPUT_DIR"/waveform_f32_square_neg.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } /* Triangle */ - result = test_waveform__by_format_and_type(ma_format_f32, ma_waveform_type_triangle, +amplitude, "output/waveform_f32_triangle.wav"); + result = test_waveform__by_format_and_type(ma_format_f32, ma_waveform_type_triangle, +amplitude, TEST_OUTPUT_DIR"/waveform_f32_triangle.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } - result = test_waveform__by_format_and_type(ma_format_f32, ma_waveform_type_triangle, -amplitude, "output/waveform_f32_triangle_neg.wav"); + result = test_waveform__by_format_and_type(ma_format_f32, ma_waveform_type_triangle, -amplitude, TEST_OUTPUT_DIR"/waveform_f32_triangle_neg.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } /* Sawtooth */ - result = test_waveform__by_format_and_type(ma_format_f32, ma_waveform_type_sawtooth, +amplitude, "output/waveform_f32_sawtooth.wav"); + result = test_waveform__by_format_and_type(ma_format_f32, ma_waveform_type_sawtooth, +amplitude, TEST_OUTPUT_DIR"/waveform_f32_sawtooth.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } - result = test_waveform__by_format_and_type(ma_format_f32, ma_waveform_type_sawtooth, -amplitude, "output/waveform_f32_sawtooth_neg.wav"); + result = test_waveform__by_format_and_type(ma_format_f32, ma_waveform_type_sawtooth, -amplitude, TEST_OUTPUT_DIR"/waveform_f32_sawtooth_neg.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } @@ -104,45 +104,45 @@ ma_result test_waveform__s16() double amplitude = 0.2; /* Sine */ - result = test_waveform__by_format_and_type(ma_format_s16, ma_waveform_type_sine, +amplitude, "output/waveform_s16_sine.wav"); + result = test_waveform__by_format_and_type(ma_format_s16, ma_waveform_type_sine, +amplitude, TEST_OUTPUT_DIR"/waveform_s16_sine.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } - result = test_waveform__by_format_and_type(ma_format_s16, ma_waveform_type_sine, -amplitude, "output/waveform_s16_sine_neg.wav"); + result = test_waveform__by_format_and_type(ma_format_s16, ma_waveform_type_sine, -amplitude, TEST_OUTPUT_DIR"/waveform_s16_sine_neg.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } /* Square */ - result = test_waveform__by_format_and_type(ma_format_s16, ma_waveform_type_square, +amplitude, "output/waveform_s16_square.wav"); + result = test_waveform__by_format_and_type(ma_format_s16, ma_waveform_type_square, +amplitude, TEST_OUTPUT_DIR"/waveform_s16_square.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } - result = test_waveform__by_format_and_type(ma_format_s16, ma_waveform_type_square, -amplitude, "output/waveform_s16_square_neg.wav"); + result = test_waveform__by_format_and_type(ma_format_s16, ma_waveform_type_square, -amplitude, TEST_OUTPUT_DIR"/waveform_s16_square_neg.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } /* Triangle */ - result = test_waveform__by_format_and_type(ma_format_s16, ma_waveform_type_triangle, +amplitude, "output/waveform_s16_triangle.wav"); + result = test_waveform__by_format_and_type(ma_format_s16, ma_waveform_type_triangle, +amplitude, TEST_OUTPUT_DIR"/waveform_s16_triangle.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } - result = test_waveform__by_format_and_type(ma_format_s16, ma_waveform_type_triangle, -amplitude, "output/waveform_s16_triangle_neg.wav"); + result = test_waveform__by_format_and_type(ma_format_s16, ma_waveform_type_triangle, -amplitude, TEST_OUTPUT_DIR"/waveform_s16_triangle_neg.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } /* Sawtooth */ - result = test_waveform__by_format_and_type(ma_format_s16, ma_waveform_type_sawtooth, +amplitude, "output/waveform_s16_sawtooth.wav"); + result = test_waveform__by_format_and_type(ma_format_s16, ma_waveform_type_sawtooth, +amplitude, TEST_OUTPUT_DIR"/waveform_s16_sawtooth.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } - result = test_waveform__by_format_and_type(ma_format_s16, ma_waveform_type_sawtooth, -amplitude, "output/waveform_s16_sawtooth_neg.wav"); + result = test_waveform__by_format_and_type(ma_format_s16, ma_waveform_type_sawtooth, -amplitude, TEST_OUTPUT_DIR"/waveform_s16_sawtooth_neg.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } @@ -162,45 +162,45 @@ ma_result test_waveform__u8() double amplitude = 0.2; /* Sine */ - result = test_waveform__by_format_and_type(ma_format_u8, ma_waveform_type_sine, +amplitude, "output/waveform_u8_sine.wav"); + result = test_waveform__by_format_and_type(ma_format_u8, ma_waveform_type_sine, +amplitude, TEST_OUTPUT_DIR"/waveform_u8_sine.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } - result = test_waveform__by_format_and_type(ma_format_u8, ma_waveform_type_sine, -amplitude, "output/waveform_u8_sine_neg.wav"); + result = test_waveform__by_format_and_type(ma_format_u8, ma_waveform_type_sine, -amplitude, TEST_OUTPUT_DIR"/waveform_u8_sine_neg.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } /* Square */ - result = test_waveform__by_format_and_type(ma_format_u8, ma_waveform_type_square, +amplitude, "output/waveform_u8_square.wav"); + result = test_waveform__by_format_and_type(ma_format_u8, ma_waveform_type_square, +amplitude, TEST_OUTPUT_DIR"/waveform_u8_square.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } - result = test_waveform__by_format_and_type(ma_format_u8, ma_waveform_type_square, -amplitude, "output/waveform_u8_square_neg.wav"); + result = test_waveform__by_format_and_type(ma_format_u8, ma_waveform_type_square, -amplitude, TEST_OUTPUT_DIR"/waveform_u8_square_neg.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } /* Triangle */ - result = test_waveform__by_format_and_type(ma_format_u8, ma_waveform_type_triangle, +amplitude, "output/waveform_u8_triangle.wav"); + result = test_waveform__by_format_and_type(ma_format_u8, ma_waveform_type_triangle, +amplitude, TEST_OUTPUT_DIR"/waveform_u8_triangle.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } - result = test_waveform__by_format_and_type(ma_format_u8, ma_waveform_type_triangle, -amplitude, "output/waveform_u8_triangle_neg.wav"); + result = test_waveform__by_format_and_type(ma_format_u8, ma_waveform_type_triangle, -amplitude, TEST_OUTPUT_DIR"/waveform_u8_triangle_neg.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } /* Sawtooth */ - result = test_waveform__by_format_and_type(ma_format_u8, ma_waveform_type_sawtooth, +amplitude, "output/waveform_u8_sawtooth.wav"); + result = test_waveform__by_format_and_type(ma_format_u8, ma_waveform_type_sawtooth, +amplitude, TEST_OUTPUT_DIR"/waveform_u8_sawtooth.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; } - result = test_waveform__by_format_and_type(ma_format_u8, ma_waveform_type_sawtooth, -amplitude, "output/waveform_u8_sawtooth_neg.wav"); + result = test_waveform__by_format_and_type(ma_format_u8, ma_waveform_type_sawtooth, -amplitude, TEST_OUTPUT_DIR"/waveform_u8_sawtooth_neg.wav"); if (result != MA_SUCCESS) { hasError = MA_TRUE; }