summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test')
-rw-r--r--cpp/test/Common/Makefile.mk2
-rw-r--r--cpp/test/Glacier2/dynamicFiltering/Makefile.mk2
-rw-r--r--cpp/test/Glacier2/sessionControl/Makefile.mk2
-rw-r--r--cpp/test/Ice/info/Makefile.mk2
-rw-r--r--cpp/test/Ice/services/Makefile.mk2
-rw-r--r--cpp/test/IceDiscovery/simple/Makefile.mk2
-rw-r--r--cpp/test/IceGrid/simple/Makefile.mk2
-rw-r--r--cpp/test/IceSSL/configuration/Makefile.mk2
-rw-r--r--cpp/test/IceStorm/federation/Makefile.mk2
-rw-r--r--cpp/test/IceStorm/federation2/Makefile.mk2
-rw-r--r--cpp/test/IceStorm/rep1/Makefile.mk2
-rw-r--r--cpp/test/IceStorm/repgrid/Makefile.mk2
-rw-r--r--cpp/test/IceStorm/repstress/Makefile.mk2
-rw-r--r--cpp/test/IceStorm/single/Makefile.mk2
-rw-r--r--cpp/test/IceStorm/stress/Makefile.mk2
-rw-r--r--cpp/test/IceUtil/stacktrace/StackTrace.debug-release.OSX2
-rw-r--r--cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX6
-rw-r--r--cpp/test/IceUtil/stacktrace/StackTrace.release.OSX2
18 files changed, 20 insertions, 20 deletions
diff --git a/cpp/test/Common/Makefile.mk b/cpp/test/Common/Makefile.mk
index f4dd1d776d4..6403a45309a 100644
--- a/cpp/test/Common/Makefile.mk
+++ b/cpp/test/Common/Makefile.mk
@@ -11,7 +11,7 @@ $(project)_libraries = TestCommon
$(project)_noinstall := 1
TestCommon_targetdir := lib
-TestCommon_dependencies := Ice IceUtil
+TestCommon_dependencies := Ice
TestCommon_sliceflags := --dll-export TEST_API
TestCommon_cppflags := -DTEST_API_EXPORTS -I$(includedir) -I$(project) -Itest/include
diff --git a/cpp/test/Glacier2/dynamicFiltering/Makefile.mk b/cpp/test/Glacier2/dynamicFiltering/Makefile.mk
index 5545484237e..dde95aa40d5 100644
--- a/cpp/test/Glacier2/dynamicFiltering/Makefile.mk
+++ b/cpp/test/Glacier2/dynamicFiltering/Makefile.mk
@@ -7,7 +7,7 @@
#
# **********************************************************************
-$(test)_dependencies = Glacier2 Ice IceUtil TestCommon
+$(test)_dependencies = Glacier2 Ice TestCommon
$(test)_client_sources = Client.cpp Test.ice
diff --git a/cpp/test/Glacier2/sessionControl/Makefile.mk b/cpp/test/Glacier2/sessionControl/Makefile.mk
index 39e93bceac6..64810ff1f4f 100644
--- a/cpp/test/Glacier2/sessionControl/Makefile.mk
+++ b/cpp/test/Glacier2/sessionControl/Makefile.mk
@@ -7,7 +7,7 @@
#
# **********************************************************************
-$(test)_dependencies = Glacier2 Ice IceUtil TestCommon
+$(test)_dependencies = Glacier2 Ice TestCommon
$(test)_client_sources = Client.cpp Session.ice
diff --git a/cpp/test/Ice/info/Makefile.mk b/cpp/test/Ice/info/Makefile.mk
index 434ad5349fa..eb728bd5bbf 100644
--- a/cpp/test/Ice/info/Makefile.mk
+++ b/cpp/test/Ice/info/Makefile.mk
@@ -8,6 +8,6 @@
# **********************************************************************
$(test)_client_sources = Test.ice TestI.cpp Client.cpp AllTests.cpp
-$(test)_dependencies = IceSSL Ice IceUtil TestCommon
+$(test)_dependencies = IceSSL Ice TestCommon
tests += $(test) \ No newline at end of file
diff --git a/cpp/test/Ice/services/Makefile.mk b/cpp/test/Ice/services/Makefile.mk
index 7d7ff76732f..2e5f1cd7e09 100644
--- a/cpp/test/Ice/services/Makefile.mk
+++ b/cpp/test/Ice/services/Makefile.mk
@@ -7,6 +7,6 @@
#
# **********************************************************************
-$(test)_dependencies = Glacier2 IceStorm IceGrid Ice IceUtil TestCommon
+$(test)_dependencies = Glacier2 IceStorm IceGrid Ice TestCommon
tests += $(test) \ No newline at end of file
diff --git a/cpp/test/IceDiscovery/simple/Makefile.mk b/cpp/test/IceDiscovery/simple/Makefile.mk
index 70d52e49241..6a37be70a15 100644
--- a/cpp/test/IceDiscovery/simple/Makefile.mk
+++ b/cpp/test/IceDiscovery/simple/Makefile.mk
@@ -7,6 +7,6 @@
#
# **********************************************************************
-$(test)_dependencies = IceDiscovery Ice IceUtil TestCommon
+$(test)_dependencies = IceDiscovery Ice TestCommon
tests += $(test)
diff --git a/cpp/test/IceGrid/simple/Makefile.mk b/cpp/test/IceGrid/simple/Makefile.mk
index c8346e72030..00a01bcb0ed 100644
--- a/cpp/test/IceGrid/simple/Makefile.mk
+++ b/cpp/test/IceGrid/simple/Makefile.mk
@@ -7,6 +7,6 @@
#
# **********************************************************************
-$(test)_dependencies = IceLocatorDiscovery IceGrid Glacier2 Ice IceUtil TestCommon
+$(test)_dependencies = IceLocatorDiscovery IceGrid Glacier2 Ice TestCommon
tests += $(test) \ No newline at end of file
diff --git a/cpp/test/IceSSL/configuration/Makefile.mk b/cpp/test/IceSSL/configuration/Makefile.mk
index b0c9b1f2ab1..84b17c74c80 100644
--- a/cpp/test/IceSSL/configuration/Makefile.mk
+++ b/cpp/test/IceSSL/configuration/Makefile.mk
@@ -7,6 +7,6 @@
#
# **********************************************************************
-$(test)_dependencies = IceSSL Ice IceUtil TestCommon
+$(test)_dependencies = IceSSL Ice TestCommon
tests += $(test)
diff --git a/cpp/test/IceStorm/federation/Makefile.mk b/cpp/test/IceStorm/federation/Makefile.mk
index de316f2bbda..8d735359c70 100644
--- a/cpp/test/IceStorm/federation/Makefile.mk
+++ b/cpp/test/IceStorm/federation/Makefile.mk
@@ -8,7 +8,7 @@
# **********************************************************************
$(test)_programs = publisher subscriber
-$(test)_dependencies = IceStorm Ice IceUtil TestCommon
+$(test)_dependencies = IceStorm Ice TestCommon
$(test)_publisher_sources = Publisher.cpp Event.ice
$(test)_subscriber_sources = Subscriber.cpp Event.ice
diff --git a/cpp/test/IceStorm/federation2/Makefile.mk b/cpp/test/IceStorm/federation2/Makefile.mk
index 012bbe6da48..9315d0a6a59 100644
--- a/cpp/test/IceStorm/federation2/Makefile.mk
+++ b/cpp/test/IceStorm/federation2/Makefile.mk
@@ -8,7 +8,7 @@
# **********************************************************************
$(test)_programs = publisher subscriber
-$(test)_dependencies = IceStorm Ice IceUtil TestCommon
+$(test)_dependencies = IceStorm Ice TestCommon
$(test)_publisher_sources = Publisher.cpp Event.ice
$(test)_subscriber_sources = Subscriber.cpp Event.ice
diff --git a/cpp/test/IceStorm/rep1/Makefile.mk b/cpp/test/IceStorm/rep1/Makefile.mk
index 5155cc324f6..aba2205cdaa 100644
--- a/cpp/test/IceStorm/rep1/Makefile.mk
+++ b/cpp/test/IceStorm/rep1/Makefile.mk
@@ -8,7 +8,7 @@
# **********************************************************************
$(test)_programs = publisher subscriber sub
-$(test)_dependencies = IceStorm Ice IceUtil TestCommon
+$(test)_dependencies = IceStorm Ice TestCommon
$(test)_publisher_sources = Publisher.cpp Single.ice
$(test)_subscriber_sources = Subscriber.cpp Single.ice
diff --git a/cpp/test/IceStorm/repgrid/Makefile.mk b/cpp/test/IceStorm/repgrid/Makefile.mk
index 437b6c6b36f..a6bd78d5e33 100644
--- a/cpp/test/IceStorm/repgrid/Makefile.mk
+++ b/cpp/test/IceStorm/repgrid/Makefile.mk
@@ -7,7 +7,7 @@
#
# **********************************************************************
-$(test)_dependencies = IceStorm Ice IceUtil TestCommon
+$(test)_dependencies = IceStorm Ice TestCommon
$(test)_client_sources = Client.cpp Single.ice
diff --git a/cpp/test/IceStorm/repstress/Makefile.mk b/cpp/test/IceStorm/repstress/Makefile.mk
index 63d03c56fb7..1dade11fe2d 100644
--- a/cpp/test/IceStorm/repstress/Makefile.mk
+++ b/cpp/test/IceStorm/repstress/Makefile.mk
@@ -8,7 +8,7 @@
# **********************************************************************
$(test)_programs = publisher subscriber control
-$(test)_dependencies = IceStorm Ice IceUtil TestCommon
+$(test)_dependencies = IceStorm Ice TestCommon
$(test)_publisher_sources = Publisher.cpp Single.ice Controller.ice
$(test)_subscriber_sources = Subscriber.cpp Single.ice Controller.ice
diff --git a/cpp/test/IceStorm/single/Makefile.mk b/cpp/test/IceStorm/single/Makefile.mk
index 60694e4883d..2ed64d34d89 100644
--- a/cpp/test/IceStorm/single/Makefile.mk
+++ b/cpp/test/IceStorm/single/Makefile.mk
@@ -8,7 +8,7 @@
# **********************************************************************
$(test)_programs = publisher subscriber
-$(test)_dependencies = IceStorm Ice IceUtil TestCommon
+$(test)_dependencies = IceStorm Ice TestCommon
$(test)_publisher_sources = Publisher.cpp Single.ice
$(test)_subscriber_sources = Subscriber.cpp Single.ice
diff --git a/cpp/test/IceStorm/stress/Makefile.mk b/cpp/test/IceStorm/stress/Makefile.mk
index 96cfdfccc30..cbd00e516bb 100644
--- a/cpp/test/IceStorm/stress/Makefile.mk
+++ b/cpp/test/IceStorm/stress/Makefile.mk
@@ -8,7 +8,7 @@
# **********************************************************************
$(test)_programs = publisher subscriber
-$(test)_dependencies = IceStorm Ice IceUtil TestCommon
+$(test)_dependencies = IceStorm Ice TestCommon
$(test)_publisher_sources = Publisher.cpp Event.ice
$(test)_subscriber_sources = Subscriber.cpp Event.ice
diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.debug-release.OSX b/cpp/test/IceUtil/stacktrace/StackTrace.debug-release.OSX
index 8f02f6229d8..754ca4c9302 100644
--- a/cpp/test/IceUtil/stacktrace/StackTrace.debug-release.OSX
+++ b/cpp/test/IceUtil/stacktrace/StackTrace.debug-release.OSX
@@ -1,4 +1,4 @@
- 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.7a0.dylib
+ 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7a0.dylib
1 (anonymous namespace)::Thrower::fifth in client
2 (anonymous namespace)::Thrower::forth in client
3 (anonymous namespace)::Thrower::third in client
diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX b/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX
index aaafd456370..878bf41ba65 100644
--- a/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX
+++ b/cpp/test/IceUtil/stacktrace/StackTrace.debug.OSX
@@ -1,6 +1,6 @@
- 0 IceUtil::Exception::Exception(char const*, int) in libIceUtil.3.7a0.dylib
- 1 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.7a0.dylib
- 2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.7a0.dylib
+ 0 IceUtil::Exception::Exception(char const*, int) in libIce.3.7a0.dylib
+ 1 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7a0.dylib
+ 2 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7a0.dylib
3 (anonymous namespace)::Thrower::fifth() in client
4 (anonymous namespace)::Thrower::forth() in client
5 (anonymous namespace)::Thrower::third() in client
diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX b/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX
index 3bb0ce97ea5..615e28e9cb9 100644
--- a/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX
+++ b/cpp/test/IceUtil/stacktrace/StackTrace.release.OSX
@@ -1,3 +1,3 @@
- 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIceUtil.3.7a0.dylib
+ 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7a0.dylib
1 main in client
2 start in libdyld.dylib \ No newline at end of file