From: Paul Brossier Date: Thu, 29 Nov 2018 15:26:45 +0000 (+0100) Subject: [tests] use run_on_default_source_and_sink in sink tests X-Git-Tag: 0.4.9~139^2~10 X-Git-Url: https://git.aubio.org/?p=aubio.git;a=commitdiff_plain;h=ee0c4d503d7ca5b987b1b9a12c6adafc481b2577 [tests] use run_on_default_source_and_sink in sink tests --- diff --git a/tests/src/io/test-sink-multi.c b/tests/src/io/test-sink-multi.c index 2ddb6fbb..f30aa059 100644 --- a/tests/src/io/test-sink-multi.c +++ b/tests/src/io/test-sink-multi.c @@ -9,8 +9,8 @@ int main (int argc, char **argv) sint_t err = 0; if (argc < 3) { - err = 2; - PRINT_ERR("not enough arguments\n"); + PRINT_ERR("not enough arguments, running tests\n"); + err = run_on_default_source_and_sink(main); PRINT_MSG("usage: %s [samplerate] [channels] [hop_size]\n", argv[0]); return err; } diff --git a/tests/src/io/test-sink.c b/tests/src/io/test-sink.c index 2f04177b..ce232b17 100644 --- a/tests/src/io/test-sink.c +++ b/tests/src/io/test-sink.c @@ -6,8 +6,8 @@ int main (int argc, char **argv) sint_t err = 0; if (argc < 3) { - err = 2; - PRINT_ERR("not enough arguments\n"); + PRINT_ERR("not enough arguments, running tests\n"); + err = run_on_default_source_and_sink(main); PRINT_MSG("usage: %s [samplerate] [hop_size]\n", argv[0]); return err; } diff --git a/tests/src/io/test-sink_apple_audio-multi.c b/tests/src/io/test-sink_apple_audio-multi.c index 1017176f..ffff6935 100644 --- a/tests/src/io/test-sink_apple_audio-multi.c +++ b/tests/src/io/test-sink_apple_audio-multi.c @@ -10,8 +10,8 @@ int main (int argc, char **argv) sint_t err = 0; if (argc < 3) { - err = 2; - PRINT_ERR("not enough arguments\n"); + PRINT_ERR("not enough arguments, running tests\n"); + err = run_on_default_source_and_sink(main); PRINT_MSG("usage: %s [samplerate] [channels] [hop_size]\n", argv[0]); return err; } @@ -71,7 +71,7 @@ beach_fmat: del_aubio_source(i); beach_source: #else /* HAVE_SINK_APPLE_AUDIO */ - err = 3; + err = 0; PRINT_ERR("aubio was not compiled with aubio_sink_apple_audio\n"); #endif /* HAVE_SINK_APPLE_AUDIO */ return err; diff --git a/tests/src/io/test-sink_apple_audio.c b/tests/src/io/test-sink_apple_audio.c index 86d17696..2200d500 100644 --- a/tests/src/io/test-sink_apple_audio.c +++ b/tests/src/io/test-sink_apple_audio.c @@ -10,8 +10,8 @@ int main (int argc, char **argv) sint_t err = 0; if (argc < 3) { - err = 2; - PRINT_ERR("not enough arguments\n"); + PRINT_ERR("not enough arguments, running tests\n"); + err = run_on_default_source_and_sink(main); PRINT_MSG("usage: %s [samplerate] [hop_size]\n", argv[0]); return err; } @@ -60,7 +60,7 @@ beach_source: del_fvec(vec); beach_fvec: #else /* HAVE_SINK_APPLE_AUDIO */ - err = 3; + err = 0; PRINT_ERR("aubio was not compiled with aubio_source_apple_audio\n"); #endif /* HAVE_SINK_APPLE_AUDIO */ return err; diff --git a/tests/src/io/test-sink_sndfile-multi.c b/tests/src/io/test-sink_sndfile-multi.c index d06911c0..1a8677a4 100644 --- a/tests/src/io/test-sink_sndfile-multi.c +++ b/tests/src/io/test-sink_sndfile-multi.c @@ -10,8 +10,8 @@ int main (int argc, char **argv) sint_t err = 0; if (argc < 3) { - err = 2; - PRINT_ERR("not enough arguments\n"); + PRINT_ERR("not enough arguments, running tests\n"); + err = run_on_default_source_and_sink(main); PRINT_MSG("usage: %s [samplerate] [channels] [hop_size]\n", argv[0]); return err; } @@ -71,7 +71,7 @@ beach_fmat: del_aubio_source(i); beach_source: #else - err = 3; + err = 0; PRINT_ERR("aubio was not compiled with aubio_sink_sndfile\n"); #endif /* HAVE_SNDFILE */ return err; diff --git a/tests/src/io/test-sink_sndfile.c b/tests/src/io/test-sink_sndfile.c index fe95310a..1ecbba5c 100644 --- a/tests/src/io/test-sink_sndfile.c +++ b/tests/src/io/test-sink_sndfile.c @@ -10,8 +10,8 @@ int main (int argc, char **argv) sint_t err = 0; if (argc < 3) { - err = 2; - PRINT_ERR("not enough arguments\n"); + PRINT_ERR("not enough arguments, running tests\n"); + err = run_on_default_source_and_sink(main); PRINT_MSG("usage: %s [samplerate] [hop_size]\n", argv[0]); return err; } @@ -60,7 +60,7 @@ beach_source: del_fvec(vec); beach_fvec: #else - err = 3; + err = 0; PRINT_ERR("aubio was not compiled with aubio_source_sndfile\n"); #endif /* HAVE_SNDFILE */ return err; diff --git a/tests/src/io/test-sink_wavwrite-multi.c b/tests/src/io/test-sink_wavwrite-multi.c index 32a8abfc..2388677e 100644 --- a/tests/src/io/test-sink_wavwrite-multi.c +++ b/tests/src/io/test-sink_wavwrite-multi.c @@ -10,8 +10,8 @@ int main (int argc, char **argv) sint_t err = 0; if (argc < 3) { - err = 2; - PRINT_ERR("not enough arguments\n"); + PRINT_ERR("not enough arguments, running tests\n"); + err = run_on_default_source_and_sink(main); PRINT_MSG("usage: %s [samplerate] [channels] [hop_size]\n", argv[0]); return err; } @@ -71,7 +71,7 @@ beach_fmat: del_aubio_source(i); beach_source: #else - err = 3; + err = 0; PRINT_ERR("aubio was not compiled with aubio_sink_wavwrite\n"); #endif /* HAVE_WAVWRITE */ return err; diff --git a/tests/src/io/test-sink_wavwrite.c b/tests/src/io/test-sink_wavwrite.c index 2e758e34..f1a8006e 100644 --- a/tests/src/io/test-sink_wavwrite.c +++ b/tests/src/io/test-sink_wavwrite.c @@ -10,8 +10,8 @@ int main (int argc, char **argv) sint_t err = 0; if (argc < 3) { - err = 2; - PRINT_ERR("not enough arguments\n"); + PRINT_ERR("not enough arguments, running tests\n"); + err = run_on_default_source_and_sink(main); PRINT_MSG("usage: %s [samplerate] [hop_size]\n", argv[0]); return err; } @@ -60,7 +60,7 @@ beach_source: del_fvec(vec); beach_fvec: #else - err = 3; + err = 0; PRINT_ERR("aubio was not compiled with aubio_sink_wavwrite\n"); #endif /* HAVE_WAVWRITE */ return err;