Merge 7f5ea5a28c into be008e657d

devscripts/run_tests.sh

@@ -14,9 +14,7 @@ case "$YTDL_TEST_SET" in
         test_set="-I test_(?!$DOWNLOAD_TESTS).+\.py"
         multiprocess_args="--processes=4 --process-timeout=540"
     ;;
-    *)
-        break
-    ;;
 esac
 
+# shellcheck disable=SC2086
 nosetests test --verbose $test_set $multiprocess_args

devscripts/wine-py2exe.sh

@@ -14,7 +14,7 @@ if [ ! -d wine-py2exe ]; then
 
     mkdir wine-py2exe
     cd wine-py2exe
-    export WINEPREFIX=`pwd`
+    WINEPREFIX=$(pwd); export WINEPREFIX
 
     axel -a "http://www.python.org/ftp/python/2.7/python-2.7.msi"
     axel -a "http://downloads.sourceforge.net/project/py2exe/py2exe/0.6.9/py2exe-0.6.9.win32-py2.7.exe"
@@ -45,7 +45,7 @@ if [ ! -d wine-py2exe ]; then
     
 else
 
-    export WINEPREFIX="$( cd wine-py2exe && pwd )"
+    WINEPREFIX=$( cd wine-py2exe && pwd ); export WINEPREFIX
 
 fi