From 015ee24d60a7001cafd661c397fc9d2fabee0f4d Mon Sep 17 00:00:00 2001
From: Joe George <joe@zeroc.com>
Date: Fri, 4 Sep 2015 14:47:00 -0400
Subject: ICE-6786 - Fix TestUtil not to crash testing Java on unknown distro

---
 scripts/TestUtil.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts/TestUtil.py')

diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index ace9c8dac2a..36bfd5c7d1e 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -848,7 +848,7 @@ def hashPasswords(filePath, entries):
     passwords = open(filePath, "a")
 
     command = "%s %s" % (sys.executable, os.path.abspath(os.path.join(os.path.dirname(__file__), "icehashpassword.py")))
-    
+
     #
     # For Linux ARM default rounds makes test slower (Usually runs on embbeded boards)
     #
@@ -1811,7 +1811,7 @@ def getJavaLibraryPath():
         if "LD_LIBRARY_PATH" in os.environ:
             libpath = os.environ["LD_LIBRARY_PATH"] + ":" + libpath
         return "-Djava.library.path=%s " % libpath
-    return None
+    return ''
 
 def getServiceDir():
     global serviceDir
@@ -2309,11 +2309,11 @@ def runTests(start, expanded, num = 0, script = False):
             if isDarwin() and "nodarwin" in config:
                 print("%s*** test not supported under Darwin%s" % (prefix, suffix))
                 continue
-            
+
             if isYocto() and "noyocto" in config:
                 print("%s*** test not supported under Yocto%s" % (prefix, suffix))
                 continue
-            
+
             if not isWin32() and "win32only" in config:
                 print("%s*** test only supported under Win32%s" % (prefix, suffix))
                 continue
-- 
cgit v1.2.3