# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1547930475 -3600
# Node ID 5ba82f4054532d9029942c401a214100525187e4
# Parent  01f4ee6779d5015f8a768e2eada207237fc86bab# Parent  33fc61e5e11911e43580694d99a86993dd37121d
branching: merge wit stable

diff -r 01f4ee6779d5 -r 5ba82f405453 tests/testlib/pythonpath.sh
--- a/tests/testlib/pythonpath.sh	Thu Jan 17 12:37:40 2019 +0100
+++ b/tests/testlib/pythonpath.sh	Sat Jan 19 21:41:15 2019 +0100
@@ -3,8 +3,7 @@
 export SRCDIR="`dirname $TESTDIR`"
 if [ -n "$PYTHONPATH" ]; then
     export HGTEST_ORIG_PYTHONPATH=$PYTHONPATH
-    osname="`uname -o`"
-    if (uname -o | grep -q Msys); then
+    if uname -o | grep -q Msys; then
         export PYTHONPATH="$SRCDIR;$PYTHONPATH"
     else
         export PYTHONPATH=$SRCDIR:$PYTHONPATH