diff options
| author | Mark Spruiell <mes@zeroc.com> | 2004-07-02 03:33:05 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2004-07-02 03:33:05 +0000 |
| commit | 4c48d78b214919de692dd481b4529d9e7e0bbe1c (patch) | |
| tree | 33996123ed26b9b79681e61cd2219ac71725ead5 /cpp | |
| parent | Added warning if Ice.Override.Compress is set to non-zero value. (diff) | |
| download | ice-4c48d78b214919de692dd481b4529d9e7e0bbe1c.tar.bz2 ice-4c48d78b214919de692dd481b4529d9e7e0bbe1c.tar.xz ice-4c48d78b214919de692dd481b4529d9e7e0bbe1c.zip | |
more Win32 fixes for Slice checksumssrc
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/test/Ice/checksum/client/checksumC.dsp | 4 | ||||
| -rwxr-xr-x | cpp/test/Ice/checksum/run.py | 4 | ||||
| -rw-r--r-- | cpp/test/Ice/checksum/server/checksumS.dsp | 12 |
3 files changed, 7 insertions, 13 deletions
diff --git a/cpp/test/Ice/checksum/client/checksumC.dsp b/cpp/test/Ice/checksum/client/checksumC.dsp index e4c0c1cd3d3..56dfca79c87 100644 --- a/cpp/test/Ice/checksum/client/checksumC.dsp +++ b/cpp/test/Ice/checksum/client/checksumC.dsp @@ -130,7 +130,7 @@ USERDEP__TEST_="..\..\..\..\bin\slice2cpp.exe" "..\..\..\..\lib\slice.lib" InputPath=.\Test.ice
BuildCmds= \
- ..\..\..\..\bin\slice2cpp.exe Test.ice
+ ..\..\..\..\bin\slice2cpp.exe -I../../../../slice Test.ice
"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -146,7 +146,7 @@ USERDEP__TEST_="..\..\..\..\bin\slice2cpp.exe" "..\..\..\..\lib\sliced.lib" InputPath=.\Test.ice
BuildCmds= \
- ..\..\..\..\bin\slice2cpp.exe Test.ice
+ ..\..\..\..\bin\slice2cpp.exe -I../../../../slice Test.ice
"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cpp/test/Ice/checksum/run.py b/cpp/test/Ice/checksum/run.py index be38984149e..31fdf683644 100755 --- a/cpp/test/Ice/checksum/run.py +++ b/cpp/test/Ice/checksum/run.py @@ -22,5 +22,7 @@ import TestUtil name = os.path.join("Ice", "checksum") -TestUtil.clientServerTestWithOptionsAndNames(name, "", "", "server/server", "client/client") +server = os.path.join("server", "server") +client = os.path.join("client", "client") +TestUtil.clientServerTestWithOptionsAndNames(name, "", "", server, client) sys.exit(0) diff --git a/cpp/test/Ice/checksum/server/checksumS.dsp b/cpp/test/Ice/checksum/server/checksumS.dsp index a21760c5ebf..ba1918dce0d 100644 --- a/cpp/test/Ice/checksum/server/checksumS.dsp +++ b/cpp/test/Ice/checksum/server/checksumS.dsp @@ -102,10 +102,6 @@ SOURCE=.\Server.cpp # End Source File
# Begin Source File
-SOURCE=.\ServerPrivate.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\Test.cpp
# End Source File
# Begin Source File
@@ -122,10 +118,6 @@ SOURCE=.\Types.cpp # PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=.\ServerPrivate.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Test.h
# End Source File
# Begin Source File
@@ -151,7 +143,7 @@ USERDEP__TEST_="..\..\..\..\bin\slice2cpp.exe" "..\..\..\..\lib\slice.lib" InputPath=.\Test.ice
BuildCmds= \
- ..\..\..\..\bin\slice2cpp.exe Test.ice
+ ..\..\..\..\bin\slice2cpp.exe -I../../../../slice Test.ice
"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -167,7 +159,7 @@ USERDEP__TEST_="..\..\..\..\bin\slice2cpp.exe" "..\..\..\..\lib\sliced.lib" InputPath=.\Test.ice
BuildCmds= \
- ..\..\..\..\bin\slice2cpp.exe Test.ice
+ ..\..\..\..\bin\slice2cpp.exe -I../../../../slice Test.ice
"Test.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
|