aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2019-02-12 11:15:09 -0500
committerMarcoFalke <falke.marco@gmail.com>2019-02-12 11:15:11 -0500
commitd8794a78a887a920276c7124f1c46d69592c6c4e (patch)
tree88320157b53d177a2316e4e77dc3d7fd0a4dae4d
parent03732f8644a449af34f4df1bb3b8915fb15ef22c (diff)
parent15b31032a67f09e54b3d40a9a0b19718a6440758 (diff)
Merge #13787: Test for Windows encoding issue
15b31032a6 appveyor: Remove outdated libraries (Chun Kuan Lee) ae892adceb tests: accept unicode characters on Windows (Chun Kuan Lee) Pull request description: This PR removes unused Windows compatible path. Encoding issues has been solved. Tree-SHA512: d24dce035fe3b576eaa002896f815a6691e88618ea371171d7e39883e1d63b3ed4d4631ab3b3a26bd67ae4e8ae13b1ff188942ab7ac6a93d704e0de301368cd0
-rw-r--r--.appveyor.yml1
-rwxr-xr-xtest/functional/test_runner.py4
2 files changed, 1 insertions, 4 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index 08132edb7d..31c3aba8c6 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -17,6 +17,7 @@ install:
- cmd: pip install --quiet git+https://github.com/frerich/clcache.git@v4.2.0
# Disable zmq test for now since python zmq library on Windows would cause Access violation sometimes.
# - cmd: pip install zmq
+- cmd: vcpkg remove --outdated --recurse
- cmd: vcpkg install --triplet %PLATFORM%-windows-static %PACKAGES% > NUL
- cmd: del /s /q C:\Tools\vcpkg\installed\%PLATFORM%-windows-static\debug # Remove unused debug library
before_build:
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index d8f92e2601..999cd72108 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -250,10 +250,6 @@ def main():
# Create base test directory
tmpdir = "%s/test_runner_₿_🏃_%s" % (args.tmpdirprefix, datetime.datetime.now().strftime("%Y%m%d_%H%M%S"))
- # If we fixed the command-line and filename encoding issue on Windows, these two lines could be removed
- if config["environment"]["EXEEXT"] == ".exe":
- tmpdir = "%s/test_runner_%s" % (args.tmpdirprefix, datetime.datetime.now().strftime("%Y%m%d_%H%M%S"))
-
os.makedirs(tmpdir)
logging.debug("Temporary test directory at %s" % tmpdir)