diff options
| author | Jose <jose@zeroc.com> | 2016-01-05 22:57:56 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-01-05 22:57:56 +0100 |
| commit | a58719c5f34b1e408d12da1f1a5f5f8c9084c1db (patch) | |
| tree | 4e8c7e742dea4050d3e46fedf98533e1f70f92c0 /cpp/test | |
| parent | Make intent of previous fix more clear (diff) | |
| download | ice-a58719c5f34b1e408d12da1f1a5f5f8c9084c1db.tar.bz2 ice-a58719c5f34b1e408d12da1f1a5f5f8c9084c1db.tar.xz ice-a58719c5f34b1e408d12da1f1a5f5f8c9084c1db.zip | |
Fix ICE-6953 - Slice include path and / at end of symlink.
Diffstat (limited to 'cpp/test')
| -rwxr-xr-x | cpp/test/Slice/headers/run.py | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/cpp/test/Slice/headers/run.py b/cpp/test/Slice/headers/run.py index ba3af997e8b..12ba0d1d805 100755 --- a/cpp/test/Slice/headers/run.py +++ b/cpp/test/Slice/headers/run.py @@ -129,5 +129,27 @@ if not re.search(re.escape('#include <Ice/Identity.h>'), f.read()): print("failed!") sys.exit(1) -print("ok") +clean() + +# +# symlink directory with extra / at end +# +# +os.system("mkdir -p tmp/Ice-x.y.z/slice/Ice") +os.system("mkdir -p tmp/Ice") +os.system("cd tmp/Ice && ln -s ../Ice-x.y.z/slice/ .") +f = open("tmp/Ice-x.y.z/slice/Ice/Identity.ice", "w") +f.write("// dumy file") + +os.system("mkdir -p project1") +f = open("project1/A.ice", "w") +f.write("#include <Ice/Identity.ice>") +f.close() +os.system("cd project1 && %s -I%s/tmp/Ice/slice A.ice" % (slice2cpp, basedir)) +f = open("project1/A.h") +if not re.search(re.escape('#include <Ice/Identity.h>'), f.read()): + print("failed!") + sys.exit(1) clean() + +print("ok")
\ No newline at end of file |