4 files changed, 3 insertions, 24 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 765cb60bae8..c6e47b7eadb 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -47,15 +47,6 @@ host = "127.0.0.1"
 
 import sys, os, re
 
-def isOptimize():
-
-    rules = open(os.path.join(toplevel, "config", "Make.rules"), "r")
-    optimize = re.compile("^OPTIMIZE[ \t=]*yes", re.M).search(rules.read())
-    if optimize == None:
-        return 0
-    else:
-        return 1
-
 def getIceVersion():
 
     config = open(os.path.join(toplevel, "include", "IceUtil", "Config.h"), "r")
diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py
index 66e60be1d2e..1df2c868b6f 100755
--- a/cpp/test/IceStorm/federation/run.py
+++ b/cpp/test/IceStorm/federation/run.py
@@ -24,11 +24,7 @@ import TestUtil
 name = os.path.join("IceStorm", "federation")
 testdir = os.path.join(toplevel, "test", name)
 
-if TestUtil.isWin32() and not TestUtil.isOptimize():
-    iceBox = os.path.join(toplevel, "bin", "iceboxd")
-else:
-    iceBox = os.path.join(toplevel, "bin", "icebox")
-
+iceBox = os.path.join(toplevel, "bin", "icebox")
 iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin")
 iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin")
 
diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py
index 73003eb953e..730e23d5dbe 100755
--- a/cpp/test/IceStorm/federation2/run.py
+++ b/cpp/test/IceStorm/federation2/run.py
@@ -26,11 +26,7 @@ testdir = os.path.join(toplevel, "test", name)
 
 exedir = os.path.join(toplevel, "test", "IceStorm", "federation")
 
-if TestUtil.isWin32() and not TestUtil.isOptimize():
-    iceBox = os.path.join(toplevel, "bin", "iceboxd")
-else:
-    iceBox = os.path.join(toplevel, "bin", "icebox")
-
+iceBox = os.path.join(toplevel, "bin", "icebox")
 iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin")
 iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin")
 
diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py
index 059c2ac55e3..2089a0b40a6 100755
--- a/cpp/test/IceStorm/single/run.py
+++ b/cpp/test/IceStorm/single/run.py
@@ -24,11 +24,7 @@ import TestUtil
 name = os.path.join("IceStorm", "single")
 testdir = os.path.join(toplevel, "test", name)
 
-if TestUtil.isWin32() and not TestUtil.isOptimize():
-    iceBox = os.path.join(toplevel, "bin", "iceboxd")
-else:
-    iceBox = os.path.join(toplevel, "bin", "icebox")
-    
+iceBox = os.path.join(toplevel, "bin", "icebox")
 iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin")
 iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin")