More changes to TesetUtil for Freeze tests

1 files changed, 9 insertions, 6 deletions

diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 5c7ab53cbbc..9f4d9f98ba5 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -131,12 +131,6 @@ def isDebian():
 def isSles():
     return isLinux() and linuxDistribution and linuxDistribution == "SUSE LINUX"
 
-def isFreezeTest():
-    return toplevel.find(os.path.join("freeze","ice")) != -1
-
-def getFreezeDir(lang):
-    return os.path.join(toplevel, "..", lang)
-
 def getCppCompiler():
     compiler = ""
     if os.environ.get("CPP_COMPILER", "") != "":
@@ -316,6 +310,15 @@ if len(path) == 0:
     raise RuntimeError("can't find toplevel directory!")
 toplevel = path[0]
 
+freezeTest = os.path.exists(os.path.join(toplevel, "..", "cpp", "include", "Freeze", "Freeze.h"))
+
+def isFreezeTest():
+    global freezeTest
+    return freezeTest
+
+def getFreezeDir(lang):
+    return os.path.join(toplevel, "..", lang)
+
 #
 # Set the default arch to x64 on x64 machines, this could be overriden
 # with the --x86 command line argument.