summaryrefslogtreecommitdiff
path: root/TAO/tests
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests')
-rw-r--r--TAO/tests/Bug_3315_Regression/main.cpp3
-rw-r--r--TAO/tests/Bug_3321_Regression/main.cpp3
-rw-r--r--TAO/tests/IDL_Test/typeprefix.idl2
-rw-r--r--TAO/tests/IDL_Test/union.idl5
-rw-r--r--TAO/tests/MProfile/README2
-rw-r--r--TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/client.cpp2
-rw-r--r--TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/bands_r1
-rw-r--r--TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/invocation_priorities_r1
-rw-r--r--TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/lanes_r1
-rwxr-xr-xTAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl14
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/client.cpp2
12 files changed, 8 insertions, 30 deletions
diff --git a/TAO/tests/Bug_3315_Regression/main.cpp b/TAO/tests/Bug_3315_Regression/main.cpp
index 472ac65e3bf..708fd164aab 100644
--- a/TAO/tests/Bug_3315_Regression/main.cpp
+++ b/TAO/tests/Bug_3315_Regression/main.cpp
@@ -5,9 +5,6 @@
int result = 0;
-#if defined (__SUNPRO_CC)
-extern "C"
-#endif /* __SUNPRO_CC */
ACE_THR_FUNC_RETURN main_orb(void*)
{
try
diff --git a/TAO/tests/Bug_3321_Regression/main.cpp b/TAO/tests/Bug_3321_Regression/main.cpp
index 125ea313226..3441bd1e3a7 100644
--- a/TAO/tests/Bug_3321_Regression/main.cpp
+++ b/TAO/tests/Bug_3321_Regression/main.cpp
@@ -11,9 +11,6 @@
int result = 0;
-#if defined (__SUNPRO_CC)
-extern "C"
-#endif /* __SUNPRO_CC */
ACE_THR_FUNC_RETURN main_orb(void*)
{
try
diff --git a/TAO/tests/IDL_Test/typeprefix.idl b/TAO/tests/IDL_Test/typeprefix.idl
index 5fb34afb825..0e503d5bfa9 100644
--- a/TAO/tests/IDL_Test/typeprefix.idl
+++ b/TAO/tests/IDL_Test/typeprefix.idl
@@ -1,5 +1,5 @@
// Test a construct with typeprefix which failed when TAO_IDL was build
-// with Intel C++ or Sun C++
+// with Intel C++
module A
{
diff --git a/TAO/tests/IDL_Test/union.idl b/TAO/tests/IDL_Test/union.idl
index 0ea237b65e2..fdee107e2cf 100644
--- a/TAO/tests/IDL_Test/union.idl
+++ b/TAO/tests/IDL_Test/union.idl
@@ -53,10 +53,6 @@ module Necessary
};
// Union with negative cases
-// At the moment, the SunCC preprocessor separates the negative
-// sign from the number. This causes problems for the scanner/lexer
-// used by tao_idl.
-#if !defined (__SUNPRO_CC) || (__SUNPRO_CC > 0x5140)
union foo switch (short)
{
case -3:
@@ -65,7 +61,6 @@ union foo switch (short)
default: long foo_iface_member;
case 0: long foo_iface_member2;
};
-#endif // !__SUNPRO_CC || __SUNPRO_CC > 0x5120
// Make sure that CORBA_Any::to_* is used everywhere.
module UnionDiscTest
diff --git a/TAO/tests/MProfile/README b/TAO/tests/MProfile/README
index c75aa6c0026..252e19f04ba 100644
--- a/TAO/tests/MProfile/README
+++ b/TAO/tests/MProfile/README
@@ -17,7 +17,7 @@ This is a test to see whether we generate exceptions as per the
spec. When we loose connection with a connected server, the ORB would
throw a COMM_FAILURE exception. This is platform dependent. One
wouldn't see this on NT. The reason for this is the way TCP has been
-been implemented on NT & Solaris. I am not going in to the details for
+been implemented on NT. I am not going in to the details for
this behaviour. TRANSIENT exceptions are thrown when the ORB has
tried all the object references it has and is not able to establish
connection with any of them (TRANSIENT exceptions are also thrown for
diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
index 969d2a7a1ad..f97cd985f0a 100644
--- a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
@@ -25,7 +25,7 @@ file_Service_Config_Test ()
// Configurator file appropriate to the platform.
// For example, Windows Unicode uses UTF-16.
//
- // iconv(1) found on Linux and Solaris, for example, can
+ // iconv(1) found on Linux, for example, can
// be used to convert between encodings.
//
// Byte ordering is also an issue, so we should be
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
index bd10a07913b..ffbb009c40b 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
@@ -147,7 +147,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
int priority =
(ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+ ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
- // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+ // Enable FIFO scheduling
if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
priority,
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/bands_r b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/bands_r
deleted file mode 100644
index 2be55e3fa32..00000000000
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/bands_r
+++ /dev/null
@@ -1 +0,0 @@
-0 10000 20000 30000
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/invocation_priorities_r b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/invocation_priorities_r
deleted file mode 100644
index 795a75037bc..00000000000
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/invocation_priorities_r
+++ /dev/null
@@ -1 +0,0 @@
-5000 25000 \ No newline at end of file
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/lanes_r b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/lanes_r
deleted file mode 100644
index 8274a68e2ae..00000000000
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/lanes_r
+++ /dev/null
@@ -1 +0,0 @@
-0 5000 25000 \ No newline at end of file
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl
index 5d6fef3a998..4cfcd847707 100755
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl
@@ -30,17 +30,9 @@ my $status = 0;
$extra_client_args = "-k file://$client_iorfile -ORBdebuglevel $client_debuglevel -d $client_debug -x";
$extra_server_args = "-ORBdebuglevel $server_debuglevel -d $server_debug";
-
-if ($OSNAME eq "solaris") {
- $lanes = "lanes_r";
- $bands = "bands_r";
- $inv_prio = "invocation_priorities_r";
-}
-else {
- $lanes = "lanes";
- $bands = "bands";
- $inv_prio = "invocation_priorities";
-}
+$lanes = "lanes";
+$bands = "bands";
+$inv_prio = "invocation_priorities";
sub setup_configurations_2
{
diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
index 8ec4f0bf503..adf1da5926b 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
@@ -89,7 +89,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
int priority =
(ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+ ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
- // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+ // Enable FIFO scheduling
if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
priority,
View Lorry Controller Status