A few changes to support move of Freeze

3 files changed, 6 insertions, 1 deletions

diff --git a/cpp/src/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h
index a833e59e785..a833e59e785 100644
--- a/cpp/src/IceUtil/FileUtil.h
+++ b/cpp/include/IceUtil/FileUtil.h
diff --git a/cpp/src/IceXML/Parser.h b/cpp/include/IceXML/Parser.h
index f5de9291968..f5de9291968 100644
--- a/cpp/src/IceXML/Parser.h
+++ b/cpp/include/IceXML/Parser.h
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 6b22fbc1faf..83b86523037 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -1887,7 +1887,10 @@ def getTestEnv(lang, testdir):
     if lang == "cpp":
         addLdPath(os.path.join(testdir), env)
     elif lang == "java":
-        addClasspath(os.path.join(toplevel, "java", "lib", "test.jar"), env)
+        if toplevel.find(os.path.join("freeze","ice")) != -1:
+            addClasspath(os.path.join(toplevel, "..", "java", "lib", "test.jar"), env)
+        else:
+            addClasspath(os.path.join(toplevel, "java", "lib", "test.jar"), env)
     elif lang == "js":
         addPathToEnv("NODE_PATH", os.path.join(testdir), env)
 
@@ -2248,6 +2251,8 @@ def runTests(start, expanded, num = 0, script = False):
             # Deal with Java's different directory structure
             if i.find(os.path.join("java","test")) != -1:
                 dir = os.path.join(toplevel, "java", "test", "src", "main", i)
+            elif toplevel.find(os.path.join("freeze","ice")) != -1:
+                dir = os.path.join(toplevel, "..", i)
             else:
                 dir = os.path.join(toplevel, i)
             dir = os.path.normpath(dir)