diff options
| author | Jose <jose@zeroc.com> | 2014-12-03 16:49:52 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-12-03 16:49:52 +0100 |
| commit | aeaafd3f71b012ab3f07a5bd034335c9a70aab4f (patch) | |
| tree | 8e0fb07decd238d75791117dc946c7c407773f6e | |
| parent | Fixed (ICE-6053) - MFC demo warnings (diff) | |
| download | ice-aeaafd3f71b012ab3f07a5bd034335c9a70aab4f.tar.bz2 ice-aeaafd3f71b012ab3f07a5bd034335c9a70aab4f.tar.xz ice-aeaafd3f71b012ab3f07a5bd034335c9a70aab4f.zip | |
Fixed (ICE-6054) - Demo cpp/IceGrid/customLoadbalancing fails on Ubuntu 14.04 64-bit
| -rwxr-xr-x | cpp/allDemos.py | 4 | ||||
| -rw-r--r-- | demoscript/Util.py | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/cpp/allDemos.py b/cpp/allDemos.py index 3d9c1e04973..9b1c1edb67a 100755 --- a/cpp/allDemos.py +++ b/cpp/allDemos.py @@ -76,10 +76,10 @@ demos = [ # use x86 db tools that are currently not available for x64 # distributions. # -if not Util.isX86(): +if not "--x86" in sys.argv: demos += ["Freeze/backup"] -if not Util.isCpp11(): +if not "--c++11" in sys.argv: demos += ["IceGrid/customLoadBalancing"] if __name__ == "__main__": diff --git a/demoscript/Util.py b/demoscript/Util.py index 8f47573a5e2..03f1b988dd2 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -674,12 +674,6 @@ def getServiceDir(): serviceDir = "C:\\Progra~1\ZeroC\Ice-" + str(getIceVersion()) + "\\bin" return serviceDir -def isX86(): - return x86 - -def isCpp11(): - return cpp11 - def getIceBox(mapping = "cpp"): if mapping == "cpp": iceBox = "icebox" |