From 302968fc0e90550cf10bfe2c7360bc58695f5d80 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 8 Feb 2021 14:01:22 -0500 Subject: [PATCH] TT#14008 rename some test suites Rename test suites from *-test.c to test-*.c as the former is conflicting with the file name pattern of the build tests, which are listed in .gitignore. Change-Id: I8779fac492510c0996bdcb2c6250c07536fe3b63 --- t/.gitignore | 5 +++- t/Makefile | 24 +++++++++---------- t/{amr-decode-test.c => test-amr-decode.c} | 0 t/{amr-encode-test.c => test-amr-encode.c} | 0 t/{bitstr-test.c => test-bitstr.c} | 0 ..._str_hash-test.c => test-const_str_hash.c} | 0 ...-tracker-test.c => test-payload-tracker.c} | 0 t/{transcode-test.c => test-transcode.c} | 0 8 files changed, 16 insertions(+), 13 deletions(-) rename t/{amr-decode-test.c => test-amr-decode.c} (100%) rename t/{amr-encode-test.c => test-amr-encode.c} (100%) rename t/{bitstr-test.c => test-bitstr.c} (100%) rename t/{const_str_hash-test.c => test-const_str_hash.c} (100%) rename t/{payload-tracker-test.c => test-payload-tracker.c} (100%) rename t/{transcode-test.c => test-transcode.c} (100%) diff --git a/t/.gitignore b/t/.gitignore index ba47a6819..c43e91582 100644 --- a/t/.gitignore +++ b/t/.gitignore @@ -50,7 +50,10 @@ timerthread.c media_player.c dtmflib.c test-dtmf-detect -*-test +test-bitstr +test-const_str_hash.strhash +test-payload-tracker +test-transcode dtmf_rx_fillin.h *-test.c jitter_buffer.c diff --git a/t/Makefile b/t/Makefile index 6b4bf4126..1b6e832d7 100644 --- a/t/Makefile +++ b/t/Makefile @@ -56,17 +56,17 @@ LDLIBS+= -lhiredis LDLIBS+= $(shell mysql_config --libs) endif -SRCS= bitstr-test.c aes-crypt.c aead-aes-crypt.c const_str_hash-test.strhash.c +SRCS= test-bitstr.c aes-crypt.c aead-aes-crypt.c test-const_str_hash.strhash.c LIBSRCS= loglib.c auxlib.c str.c rtplib.c DAEMONSRCS= crypto.c ssrc.c aux.c rtp.c HASHSRCS= ifeq ($(with_transcoding),yes) -SRCS+= transcode-test.c test-dtmf-detect.c payload-tracker-test.c +SRCS+= test-transcode.c test-dtmf-detect.c test-payload-tracker.c SRCS+= spandsp_recv_fax_pcm.c spandsp_recv_fax_t38.c spandsp_send_fax_pcm.c \ spandsp_send_fax_t38.c ifeq ($(with_amr_tests),yes) -SRCS+= amr-decode-test.c amr-encode-test.c +SRCS+= test-amr-decode.c test-amr-encode.c endif LIBSRCS+= codeclib.c resample.c socket.c streambuf.c dtmflib.c DAEMONSRCS+= codec.c call.c ice.c kernel.c media_socket.c stun.c bencode.c poller.c \ @@ -87,11 +87,11 @@ include .depend .PHONY: all-tests unit-tests daemon-tests all-daemon-tests \ daemon-tests-main daemon-tests-jb daemon-tests-reorder -TESTS= bitstr-test aes-crypt aead-aes-crypt const_str_hash-test.strhash +TESTS= test-bitstr aes-crypt aead-aes-crypt test-const_str_hash.strhash ifeq ($(with_transcoding),yes) -TESTS+= transcode-test test-dtmf-detect payload-tracker-test +TESTS+= test-transcode test-dtmf-detect test-payload-tracker ifeq ($(with_amr_tests),yes) -TESTS+= amr-decode-test amr-encode-test +TESTS+= test-amr-decode test-amr-encode endif endif @@ -137,7 +137,7 @@ daemon-tests-reorder: test "$$(ls fake-$@-sockets)" = "" rmdir fake-$@-sockets -bitstr-test: bitstr-test.o +test-bitstr: test-bitstr.o spandsp_send_fax_pcm: spandsp_send_fax_pcm.o @@ -149,9 +149,9 @@ spandsp_recv_fax_t38: spandsp_recv_fax_t38.o spandsp_raw_fax_tests: spandsp_send_fax_pcm spandsp_recv_fax_pcm spandsp_send_fax_t38 spandsp_recv_fax_t38 -amr-decode-test: amr-decode-test.o $(COMMONOBJS) codeclib.o resample.o dtmflib.o +test-amr-decode: test-amr-decode-test.o $(COMMONOBJS) codeclib.o resample.o dtmflib.o -amr-encode-test: amr-encode-test.o $(COMMONOBJS) codeclib.o resample.o dtmflib.o +test-amr-encode: test-amr-encode-test.o $(COMMONOBJS) codeclib.o resample.o dtmflib.o test-dtmf-detect: test-dtmf-detect.o @@ -159,17 +159,17 @@ aes-crypt: aes-crypt.o $(COMMONOBJS) crypto.o aead-aes-crypt: aead-aes-crypt.o $(COMMONOBJS) crypto.o -transcode-test: transcode-test.o $(COMMONOBJS) codeclib.o resample.o codec.o ssrc.o call.o ice.o aux.o \ +test-transcode: test-transcode.o $(COMMONOBJS) codeclib.o resample.o codec.o ssrc.o call.o ice.o aux.o \ kernel.o media_socket.o stun.o bencode.o socket.o poller.o dtls.o recording.o statistics.o \ rtcp.o redis.o iptables.o graphite.o call_interfaces.strhash.o sdp.strhash.o rtp.o crypto.o \ control_ng.strhash.o \ streambuf.o cookie_cache.o udp_listener.o homer.o load.o cdr.o dtmf.o timerthread.o \ media_player.o jitter_buffer.o dtmflib.o t38.o tcp_listener.o -payload-tracker-test: payload-tracker-test.o $(COMMONOBJS) ssrc.o aux.o auxlib.o rtp.o crypto.o codeclib.o \ +test-payload-tracker: test-payload-tracker.o $(COMMONOBJS) ssrc.o aux.o auxlib.o rtp.o crypto.o codeclib.o \ resample.o dtmflib.o -const_str_hash-test.strhash: const_str_hash-test.strhash.o $(COMMONOBJS) +test-const_str_hash.strhash: test-const_str_hash.strhash.o $(COMMONOBJS) tests-preload.so: tests-preload.c $(CC) -g -D_GNU_SOURCE -std=c99 -o $@ -Wall -shared -fPIC $< -ldl diff --git a/t/amr-decode-test.c b/t/test-amr-decode.c similarity index 100% rename from t/amr-decode-test.c rename to t/test-amr-decode.c diff --git a/t/amr-encode-test.c b/t/test-amr-encode.c similarity index 100% rename from t/amr-encode-test.c rename to t/test-amr-encode.c diff --git a/t/bitstr-test.c b/t/test-bitstr.c similarity index 100% rename from t/bitstr-test.c rename to t/test-bitstr.c diff --git a/t/const_str_hash-test.c b/t/test-const_str_hash.c similarity index 100% rename from t/const_str_hash-test.c rename to t/test-const_str_hash.c diff --git a/t/payload-tracker-test.c b/t/test-payload-tracker.c similarity index 100% rename from t/payload-tracker-test.c rename to t/test-payload-tracker.c diff --git a/t/transcode-test.c b/t/test-transcode.c similarity index 100% rename from t/transcode-test.c rename to t/test-transcode.c