---
libavformat/Makefile | 2 +-
libavformat/url-test.c | 55 ++++++++++++++++++++++++++++++++++++++++++++
tests/Makefile | 2 ++
tests/fate/libavformat.mak | 5 ++++
tests/ref/fate/url | 10 ++++++++
5 files changed, 73 insertions(+), 1 deletion(-)
create mode 100644 libavformat/url-test.c
create mode 100644 tests/fate/libavformat.mak
create mode 100644 tests/ref/fate/url
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 057c058..71e72ba 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -376,7 +376,7 @@ SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h
EXAMPLES = metadata \
output \
-TESTPROGS = seek
+TESTPROGS = seek url
TOOLS = aviocat \
ismindex \
diff --git a/libavformat/url-test.c b/libavformat/url-test.c
new file mode 100644
index 0000000..74b3225
--- /dev/null
+++ b/libavformat/url-test.c
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2012 Martin Storsjo
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "internal.h"
+
+#undef printf
+#undef exit
+
+static void test(const char *base, const char *rel)
+{
+ char buf[200], buf2[200];
+ ff_make_absolute_url(buf, sizeof(buf), base, rel);
+ printf("%s\n", buf);
+ if (base) {
+ /* Test in-buffer replacement */
+ snprintf(buf2, sizeof(buf2), "%s", base);
+ ff_make_absolute_url(buf2, sizeof(buf2), buf2, rel);
+ if (strcmp(buf, buf2)) {
+ printf("In-place handling of %s + %s failed\n", base, rel);
+ exit(1);
+ }
+ }
+}
+
+int main(int argc, char **argv)
+{
+ test(NULL, "baz");
+ test("/foo/bar", "baz");
+ test("/foo/bar", "../baz");
+ test("/foo/bar", "/baz");
+ test("http://server/foo/";, "baz");
+ test("http://server/foo/bar";, "baz");
+ test("http://server/foo/";, "../baz");
+ test("http://server/foo/bar/123";, "../../baz");
+ test("http://server/foo/bar/123";, "/baz");
+ test("http://server/foo/bar/123";, "https://other/url";);
+ return 0;
+}
diff --git a/tests/Makefile b/tests/Makefile
index 2af9a91..724d963 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -47,6 +47,7 @@ include $(SRC_PATH)/tests/fate/h264.mak
include $(SRC_PATH)/tests/fate/image.mak
include $(SRC_PATH)/tests/fate/indeo.mak
include $(SRC_PATH)/tests/fate/libavcodec.mak
+include $(SRC_PATH)/tests/fate/libavformat.mak
include $(SRC_PATH)/tests/fate/libavutil.mak
include $(SRC_PATH)/tests/fate/lossless-audio.mak
include $(SRC_PATH)/tests/fate/lossless-video.mak
@@ -86,6 +87,7 @@ FATE_SAMPLES-$(CONFIG_AVCONV) += $(FATE_SAMPLES_AVCONV)
FATE_SAMPLES += $(FATE_SAMPLES-yes)
FATE += $(FATE-yes)
+FATE += $(FATE_LIBAVFORMAT)
FATE += $(FATE_LIBAVUTIL)
$(FATE_AVCONV) $(FATE_SAMPLES_AVCONV): avconv$(EXESUF)
diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak
new file mode 100644
index 0000000..9e5a9f0
--- /dev/null
+++ b/tests/fate/libavformat.mak
@@ -0,0 +1,5 @@
+FATE_LIBAVFORMAT += fate-url
+fate-url: libavformat/url-test$(EXESUF)
+fate-url: CMD = run libavformat/url-test
+
+fate-libavformat: $(FATE_LIBAVFORMAT)
diff --git a/tests/ref/fate/url b/tests/ref/fate/url
new file mode 100644
index 0000000..801e8a3
--- /dev/null
+++ b/tests/ref/fate/url
@@ -0,0 +1,10 @@
+baz
+/foo/baz
+/baz
+/baz
+http://server/foo/baz
+http://server/foo/baz
+http://server/baz
+http://server/baz
+http://server/baz
+https://other/url
--
1.7.9.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
