summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorStephan Szabo <stephan.szabo@sony.com>2021-01-20 10:08:49 -0800
committerJay Satiro <raysatiro@yahoo.com>2021-02-09 02:45:51 -0500
commit1269c80af1dc45c3cee1dbbc76270ac7c7d6f1c3 (patch)
tree8376253c4116399f71fbfd820a940949f18117f9 /tests
parentd4a3b87c13da5db437dc66d646132bdeb902e196 (diff)
downloadcurl-1269c80af1dc45c3cee1dbbc76270ac7c7d6f1c3.tar.gz
file: Support unicode urls on windows
Closes https://github.com/curl/curl/pull/6501
Diffstat (limited to 'tests')
-rw-r--r--tests/FILEFORMAT.md1
-rw-r--r--tests/data/Makefile.inc2
-rw-r--r--tests/data/test170345
-rwxr-xr-xtests/runtests.pl5
4 files changed, 52 insertions, 1 deletions
diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md
index ec0dc4815..b75a02a51 100644
--- a/tests/FILEFORMAT.md
+++ b/tests/FILEFORMAT.md
@@ -406,6 +406,7 @@ Features testable here are:
- `TLS-SRP`
- `TrackMemory`
- `typecheck`
+- `Unicode`
- `unittest`
- `unix-sockets`
- `verbose-strings`
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 464eab2a9..6762c8dcc 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -201,7 +201,7 @@ test1630 test1631 test1632 test1633 test1634 \
test1650 test1651 test1652 test1653 test1654 test1655 \
test1660 \
\
-test1700 test1701 test1702 \
+test1700 test1701 test1702 test1703 \
\
test1800 test1801 \
\
diff --git a/tests/data/test1703 b/tests/data/test1703
new file mode 100644
index 000000000..ab4f0280f
--- /dev/null
+++ b/tests/data/test1703
@@ -0,0 +1,45 @@
+<testcase>
+<info>
+<keywords>
+FILE
+</keywords>
+</info>
+
+<reply>
+<data>
+foo
+ bar
+bar
+ foo
+moo
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+file
+</server>
+<features>
+Unicode
+win32
+</features>
+<name>
+basic file:// file with UTF-8 characters
+</name>
+<command option="no-include">
+file://localhost%FILE_PWD/log/%E3%83%86%E3%82%B9%E3%83%881703.txt
+</command>
+<file name="log/ใƒ†ใ‚นใƒˆ1703.txt">
+foo
+ bar
+bar
+ foo
+moo
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+</verify>
+</testcase>
diff --git a/tests/runtests.pl b/tests/runtests.pl
index e7ed435bc..ddee02ad3 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -268,6 +268,7 @@ my $has_manual; # set if built with built-in manual
my $has_win32; # set if built for Windows
my $has_mingw; # set if built with MinGW (as opposed to MinGW-w64)
my $has_hyper = 0; # set if built with Hyper
+my $has_unicode; # set if libcurl is built with Unicode support
# this version is decided by the particular nghttp2 library that is being used
my $h2cver = "h2c";
@@ -2826,6 +2827,7 @@ sub setupfeatures {
$feature{"threaded-resolver"} = $has_threadedres;
$feature{"TLS-SRP"} = $has_tls_srp;
$feature{"TrackMemory"} = $has_memory_tracking;
+ $feature{"Unicode"} = $has_unicode;
$feature{"unittest"} = $debug_build;
$feature{"unix-sockets"} = $has_unix;
$feature{"win32"} = $has_win32;
@@ -3093,6 +3095,9 @@ sub checksystem {
# 'https-proxy' is used as "server" so consider it a protocol
push @protocols, 'https-proxy';
}
+ if($feat =~ /Unicode/i) {
+ $has_unicode = 1;
+ }
}
#
# Test harness currently uses a non-stunnel server in order to