diff --git a/Makefile b/Makefile index 6adb3af1..d0cac340 100644 --- a/Makefile +++ b/Makefile @@ -49,8 +49,8 @@ test: make test-nodocker test-nodocker: - $(foreach IMG,$(shell echo test-images/*/ | xargs -n1 basename), \ - docker build -q test-images/$(IMG) -t rtsp-simple-server-test-$(IMG)$(NL)) + $(foreach IMG,$(shell echo testimages/*/ | xargs -n1 basename), \ + docker build -q testimages/$(IMG) -t rtsp-simple-server-test-$(IMG)$(NL)) go test -race -v . stress: @@ -80,7 +80,7 @@ paths: # runOnPublish: ffmpeg -i rtsp://localhost:8554/$$RTSP_SERVER_PATH -c copy -f mpegts myfile_$$RTSP_SERVER_PATH.ts # readUser: test # readPass: tast -# runOnDemand: ffmpeg -re -stream_loop -1 -i test-images/ffmpeg/emptyvideo.ts -c copy -f rtsp rtsp://localhost:8554/$$RTSP_SERVER_PATH +# runOnDemand: ffmpeg -re -stream_loop -1 -i testimages/ffmpeg/emptyvideo.ts -c copy -f rtsp rtsp://localhost:8554/$$RTSP_SERVER_PATH # proxied: # source: rtsp://192.168.2.198:8554/stream diff --git a/main_test.go b/main_test.go index 9373a76a..713904db 100644 --- a/main_test.go +++ b/main_test.go @@ -481,7 +481,7 @@ func TestRunOnDemand(t *testing.T) { stdin := []byte("\n" + "paths:\n" + " all:\n" + - " runOnDemand: ffmpeg -hide_banner -loglevel error -re -i test-images/ffmpeg/emptyvideo.ts -c copy -f rtsp rtsp://localhost:8554/$RTSP_SERVER_PATH\n") + " runOnDemand: ffmpeg -hide_banner -loglevel error -re -i testimages/ffmpeg/emptyvideo.ts -c copy -f rtsp rtsp://localhost:8554/$RTSP_SERVER_PATH\n") p1, err := newProgram([]string{"stdin"}, bytes.NewBuffer(stdin)) require.NoError(t, err) defer p1.close() diff --git a/test-images/ffmpeg/Dockerfile b/testimages/ffmpeg/Dockerfile similarity index 100% rename from test-images/ffmpeg/Dockerfile rename to testimages/ffmpeg/Dockerfile diff --git a/test-images/ffmpeg/emptyvideo.ts b/testimages/ffmpeg/emptyvideo.ts similarity index 100% rename from test-images/ffmpeg/emptyvideo.ts rename to testimages/ffmpeg/emptyvideo.ts diff --git a/test-images/ffmpeg/start.sh b/testimages/ffmpeg/start.sh similarity index 100% rename from test-images/ffmpeg/start.sh rename to testimages/ffmpeg/start.sh diff --git a/test-images/gstreamer/Dockerfile b/testimages/gstreamer/Dockerfile similarity index 100% rename from test-images/gstreamer/Dockerfile rename to testimages/gstreamer/Dockerfile diff --git a/test-images/gstreamer/emptyvideo.ts b/testimages/gstreamer/emptyvideo.ts similarity index 100% rename from test-images/gstreamer/emptyvideo.ts rename to testimages/gstreamer/emptyvideo.ts diff --git a/test-images/gstreamer/start.sh b/testimages/gstreamer/start.sh similarity index 100% rename from test-images/gstreamer/start.sh rename to testimages/gstreamer/start.sh diff --git a/test-images/vlc/Dockerfile b/testimages/vlc/Dockerfile similarity index 100% rename from test-images/vlc/Dockerfile rename to testimages/vlc/Dockerfile diff --git a/test-images/vlc/start.sh b/testimages/vlc/start.sh similarity index 100% rename from test-images/vlc/start.sh rename to testimages/vlc/start.sh