summaryrefslogtreecommitdiff
path: root/python/test
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2015-05-25 19:19:00 +0200
committerBenoit Foucher <benoit@zeroc.com>2015-05-25 19:19:00 +0200
commit1c1c87969f2d7328bb8d11a228bfed9e08b3a912 (patch)
tree0253574142d8b1bd81506368ec089fa044e3e3db /python/test
parentICE-6405 Fixed test status check on Windows (diff)
downloadice-1c1c87969f2d7328bb8d11a228bfed9e08b3a912.tar.bz2
ice-1c1c87969f2d7328bb8d11a228bfed9e08b3a912.tar.xz
ice-1c1c87969f2d7328bb8d11a228bfed9e08b3a912.zip
Fixed Python and Ruby build systems to allow running tests against binary distribution
Diffstat (limited to 'python/test')
-rw-r--r--python/test/Slice/import/Makefile1
-rw-r--r--python/test/Slice/import/Makefile.mak4
2 files changed, 0 insertions, 5 deletions
diff --git a/python/test/Slice/import/Makefile b/python/test/Slice/import/Makefile
index 69b5a2015b3..91581b604f5 100644
--- a/python/test/Slice/import/Makefile
+++ b/python/test/Slice/import/Makefile
@@ -20,7 +20,6 @@ include $(top_srcdir)/config/Make.rules
SRCS = Test1_ice.py \
Test2_ice.py
-SLICE2PY = $(top_srcdir)/config/s2py.py
all:: $(SRCS)
Test1_ice.py: Test1.ice $(SLICE2PY) $(SLICEPARSERLIB)
diff --git a/python/test/Slice/import/Makefile.mak b/python/test/Slice/import/Makefile.mak
index a9c5fad1b74..e3935c60083 100644
--- a/python/test/Slice/import/Makefile.mak
+++ b/python/test/Slice/import/Makefile.mak
@@ -14,10 +14,6 @@ top_srcdir = ..\..\..
SRCS = Test1_ice.py \
Test2_ice.py
-!if "$(ice_src_dist)" != ""
-SLICE2PY = $(PYTHON_HOME)\python $(top_srcdir)\config\s2py.py
-!endif
-
all:: $(SRCS)
Test1_ice.py: "Test1.ice" "$(SLICEPARSERLIB)"