diff options
| author | Jose <jose@zeroc.com> | 2011-03-14 15:15:02 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2011-03-14 15:15:02 +0100 |
| commit | 008d67d77577e61d56449413a6b2e2d59ebb9408 (patch) | |
| tree | 7734a5fdd7c3dc08d2a6cba9e3922b0261cfe21f /cpp | |
| parent | 4769 - cs/test/IceBox/configuration failure with VS 2010 (diff) | |
| download | ice-008d67d77577e61d56449413a6b2e2d59ebb9408.tar.bz2 ice-008d67d77577e61d56449413a6b2e2d59ebb9408.tar.xz ice-008d67d77577e61d56449413a6b2e2d59ebb9408.zip | |
4800 - add test for environment variable substitution in IceGrid descriptor
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/test/IceGrid/deployer/Server.cpp | 6 | ||||
| -rw-r--r-- | cpp/test/IceGrid/deployer/application.xml | 4 | ||||
| -rwxr-xr-x | cpp/test/IceGrid/deployer/run.py | 2 | ||||
| -rw-r--r-- | cpp/test/IceGrid/deployer/server.xml | 2 |
4 files changed, 14 insertions, 0 deletions
diff --git a/cpp/test/IceGrid/deployer/Server.cpp b/cpp/test/IceGrid/deployer/Server.cpp index a551dd08528..3feaba48004 100644 --- a/cpp/test/IceGrid/deployer/Server.cpp +++ b/cpp/test/IceGrid/deployer/Server.cpp @@ -96,6 +96,9 @@ main(int argc, char* argv[]) test(value4 != 0 && wstring(value4) == L"2"); #endif + char* value5 = getenv("MY_WINDOWS_COMPOSED_VARIABLE"); + test(value5 != 0 && string(value5) == "BAR;12"); + #else char* value2 = getenv("MY_ENV_UNICODE_VARIABLE"); test(value2 !=0 && string(value2) == unicodeVar); @@ -105,6 +108,9 @@ main(int argc, char* argv[]) char* value4 = getenv(varname2.c_str()); test(value4 != 0 && string(value4) == "2"); + + char* value5 = getenv("MY_UNIX_COMPOSED_VARIABLE"); + test(value5 != 0 && string(value5) == "BAR;12"); #endif Server app; diff --git a/cpp/test/IceGrid/deployer/application.xml b/cpp/test/IceGrid/deployer/application.xml index 672ba853fd3..7e097fa2065 100644 --- a/cpp/test/IceGrid/deployer/application.xml +++ b/cpp/test/IceGrid/deployer/application.xml @@ -112,6 +112,8 @@ </dbenv> <option>--Test.Test=2</option> <env>MY_ENV_VARIABLE=12</env> + <env>MY_UNIX_COMPOSED_VARIABLE=BAR;$MY_FOO</env> + <env>MY_WINDOWS_COMPOSED_VARIABLE=BAR;%MY_FOO%</env> <env>MY_ENV_UNICODE_VARIABLE=A Coruña</env> <env>MY_ENV_VÄRIABLE=1</env> <env>my_env_väriable=2</env> @@ -153,6 +155,8 @@ <log path="${test.dir}/log3.txt"/> <log path="${test.dir}/log4.txt"/> <env>MY_ENV_VARIABLE=12</env> + <env>MY_UNIX_COMPOSED_VARIABLE=BAR;$MY_FOO</env> + <env>MY_WINDOWS_COMPOSED_VARIABLE=BAR;%MY_FOO%</env> <env>MY_ENV_UNICODE_VARIABLE=A Coruña</env> <env>MY_ENV_VÄRIABLE=1</env> <env>my_env_väriable=2</env> diff --git a/cpp/test/IceGrid/deployer/run.py b/cpp/test/IceGrid/deployer/run.py index 106c00ec68f..be1f1ddf91f 100755 --- a/cpp/test/IceGrid/deployer/run.py +++ b/cpp/test/IceGrid/deployer/run.py @@ -20,6 +20,8 @@ if len(path) == 0: sys.path.append(os.path.join(path[0])) from scripts import * +os.environ["MY_FOO"] = "12" + IceGridAdmin.iceGridTest("application.xml", '--TestDir="%s"' % os.getcwd(), "icebox.exe='%s'" % TestUtil.getIceBox()) # Tests with targets diff --git a/cpp/test/IceGrid/deployer/server.xml b/cpp/test/IceGrid/deployer/server.xml index 29860603b34..e4c4f3e2bd4 100644 --- a/cpp/test/IceGrid/deployer/server.xml +++ b/cpp/test/IceGrid/deployer/server.xml @@ -51,6 +51,8 @@ </properties> <env>MY_ENV_VARIABLE=12</env> + <env>MY_UNIX_COMPOSED_VARIABLE=BAR;$MY_FOO</env> + <env>MY_WINDOWS_COMPOSED_VARIABLE=BAR;%MY_FOO%</env> <env>MY_ENV_UNICODE_VARIABLE=A Coruña</env> <env>MY_ENV_VÄRIABLE=1</env> <env>my_env_väriable=2</env> |