summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ACE/ace/README31
-rw-r--r--ACE/ace/Thread_Manager.cpp2
-rw-r--r--ACE/ace/config-kfreebsd.h2
-rwxr-xr-xACE/bin/libsize.pl2
-rw-r--r--ACE/docs/run_test.txt2
-rwxr-xr-xTAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl2
-rwxr-xr-xTAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl2
-rwxr-xr-xTAO/orbsvcs/tests/Simple_Naming/run_test.pl2
-rwxr-xr-xTAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl2
-rwxr-xr-xTAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl2
-rwxr-xr-xTAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/README34
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/README38
-rwxr-xr-xTAO/tests/Alt_Mapping/run_test.pl3
-rwxr-xr-xTAO/tests/Bug_2289_Regression/run_test.pl2
-rwxr-xr-xTAO/tests/Bug_3853_Regression/run_test.pl4
-rwxr-xr-xTAO/tests/DynAny_Test/run_test.pl2
-rwxr-xr-xTAO/tests/Param_Test/run_test.pl3
18 files changed, 29 insertions, 108 deletions
diff --git a/ACE/ace/README b/ACE/ace/README
index 8a87dc09fc8..ac65e2bd96e 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -731,7 +731,7 @@ ACE_HRTIME_T_IS_BASIC_TYPE ACE_hrtime_t is a basic type that
doesn't require ACE_U64_TO_U32
conversion
ACE_LACKS_ACCESS Platform lacks access() (e.g.,
- VxWorks and Chorus)
+ VxWorks)
ACE_LACKS_ACE_IOSTREAM Platform can not build
ace/IOStream{,_T}.cpp. This
does not necessarily mean that
@@ -772,18 +772,17 @@ ACE_LACKS_INLINE_FUNCTIONS Platform can't handle "inline"
keyword correctly.
ACE_LACKS_EXEC Platform lacks the exec()
family of system calls (e.g.,
- Win32, VxWorks, Chorus)
+ Win32, VxWorks)
ACE_LACKS_FILELOCKS Platform lacks file locking
mechanism
ACE_LACKS_FORK Platform lacks the fork()
system call (e.g., Win32,
- VxWorks, Chorus)
+ VxWorks)
ACE_LACKS_GETPGID Platform lacks getpgid() call
- (e.g., Win32, Chorus, and
+ (e.g., Win32, and
FreeBSD).
ACE_LACKS_GETSERVBYNAME Platforms lacks
- getservbyname() (e.g., VxWorks
- and Chorus).
+ getservbyname() (e.g., VxWorks)
ACE_LACKS_GETIPNODEBYADDR Platform lacks getipnodebyaddr().
ACE_LACKS_GETIPNODEBYNAME Platform lacks getipnodebyname().
ACE_LACKS_INET_ATON Platform lacks the inet_aton()
@@ -792,7 +791,7 @@ ACE_LACKS_IOSTREAM_FX iostream header does not
declare ipfx (), opfx (),
etc.
ACE_LACKS_KEY_T Platform lacks key_t (e.g.,
- Chorus, VxWorks, Win32)
+ VxWorks, Win32)
ACE_LACKS_LINEBUFFERED_STREAMBUF Platform lacks streambuf
"linebuffered ()".
ACE_LACKS_LSTAT Platform lacks the lstat() function.
@@ -800,9 +799,9 @@ ACE_LACKS_MADVISE Platform lacks madvise()
(e.g., Linux)
ACE_LACKS_MALLOC_H Platform lacks malloc.h
ACE_LACKS_MEMORY_H Platform lacks memory.h (e.g.,
- VxWorks and Chorus)
+ VxWorks)
ACE_LACKS_MKFIFO Platform lacks mkfifo() e.g.,
- VxWorks, Chorus, pSoS, and WinNT.
+ VxWorks, pSoS, and WinNT.
ACE_LACKS_MKTEMP Platform lacks the mktemp() function.
ACE_LACKS_MKSTEMP Platform lacks the mkstemp() function.
ACE_LACKS_MMAP The platform doesn't have
@@ -824,7 +823,7 @@ ACE_LACKS_MSYNC Platform lacks msync() (e.g.,
ACE_LACKS_MUTEXATTR_PSHARED Platform lacks
pthread_mutexattr_setpshared().
ACE_LACKS_NAMED_POSIX_SEM Platform lacks named POSIX
- semaphores (e.g., Chorus)
+ semaphores
ACE_LACKS_NETDB_REENTRANT_FUNCTIONS Platform does not support
reentrant netdb functions
(getprotobyname_r,
@@ -867,7 +866,7 @@ ACE_LACKS_READV Platform doesn't define readv,
ACE_LACKS_RENAME Platform lacks rename().
ACE_LACKS_RLIMIT Platform/compiler lacks
{get,set}rlimit() function
- (e.g., VxWorks, Chorus, and
+ (e.g., VxWorks, and
SCO UNIX)
ACE_LACKS_RLIMIT_PROTOTYPE Platform/compiler lacks
{get,set}rlimit() prototypes
@@ -901,12 +900,11 @@ ACE_LACKS_SETSCHED Platform lacks
pthread_attr_setsched()
(e.g. MVS)
ACE_LACKS_SIGACTION Platform lacks struct
- sigaction (e.g., Win32 and
- Chorus)
+ sigaction (e.g., Win32)
ACE_LACKS_SIGNED_CHAR Platform lacks "signed char"
type (broken!)
ACE_LACKS_SIGSET Platform lacks signal sets
- (e.g., Chorus and Win32)
+ (e.g., Win32)
ACE_LACKS_STRPTIME Platform/compiler lacks the strptime()
function.
ACE_LACKS_WCSCHR Platform/compiler lacks wcschr()
@@ -916,7 +914,7 @@ ACE_LACKS_WCSRCHR Platform/compiler lacks wcsrchr()
ACE_LACKS_SWAB Platform/compiler lacks
swab () function.
ACE_LACKS_SYS_MSG_H Platform lacks sys/msg.h
- (e.g., Chorus and VxWorks)
+ (e.g., VxWorks)
ACE_LACKS_SYS_PARAM_H Platform lacks <sys/param.h>
(e.g., MVS)
ACE_LACKS_SENDMSG Platform lacks sendmsg()
@@ -985,8 +983,7 @@ ACE_LACKS_UNISTD_H Platform lacks the unistd.h
ACE_LACKS_UNIX_DOMAIN_SOCKETS ACE platform has no UNIX
domain sockets
ACE_LACKS_UNIX_SIGNALS Platform lacks full signal
- support (e.g., Win32 and
- Chorus).
+ support (e.g., Win32).
ACE_LACKS_UNSIGNEDLONGLONG_T Compiler/platform does not
support the unsigned long
long datatype.
diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp
index af2deb3ae6a..b2160add555 100644
--- a/ACE/ace/Thread_Manager.cpp
+++ b/ACE/ace/Thread_Manager.cpp
@@ -1784,7 +1784,7 @@ ACE_Thread_Manager::wait (const ACE_Time_Value *timeout,
#if !defined (ACE_HAS_VXTHREADS)
// @@ VxWorks doesn't support thr_join (yet.) We are working
- // on our implementation. Chorus'es thr_join seems broken.
+ // on our implementation.
ACE_Thread_Descriptor_Base *item = 0;
while ((item = term_thr_list_copy.delete_head ()) != 0)
diff --git a/ACE/ace/config-kfreebsd.h b/ACE/ace/config-kfreebsd.h
index 9dd2a73911c..bc13d8b428d 100644
--- a/ACE/ace/config-kfreebsd.h
+++ b/ACE/ace/config-kfreebsd.h
@@ -354,7 +354,7 @@
/* Platform defines ACE_HAS_MSG, but lacks msg_accrights{len}. */
#define ACE_LACKS_MSG_ACCRIGHTS 1
-/* Platform lacks named POSIX semaphores (e.g., Chorus) */
+/* Platform lacks named POSIX semaphores */
#define ACE_LACKS_NAMED_POSIX_SEM 1
/* Compiler complains about use of obsolete "pragma once" */
diff --git a/ACE/bin/libsize.pl b/ACE/bin/libsize.pl
index 0e80cf07994..7b9b4834092 100755
--- a/ACE/bin/libsize.pl
+++ b/ACE/bin/libsize.pl
@@ -105,8 +105,6 @@ if ($ACE_ROOT =~ /vxworks/) {
$size = '/usr/lynx/3.0.0/ppc/cdk/sunos-xcoff-ppc/bin/size';
} elsif ($ACE_ROOT =~ /lynx/) {
$size = '/usr/lynx/3.0.0/x86/cdk/sunos-coff-x86/bin/size';
-} elsif ($ACE_ROOT =~ /chorus/) {
- $size = '/project/doc/mvme/green68k/gnu/bin/size';
} else {
$size = 'size';
}
diff --git a/ACE/docs/run_test.txt b/ACE/docs/run_test.txt
index 5e7e089f2a4..3aef95935b9 100644
--- a/ACE/docs/run_test.txt
+++ b/ACE/docs/run_test.txt
@@ -140,7 +140,7 @@ $server->DeleteFile($iorbase);
$client->DeleteFile($iorbase);
@endverbatim
-Because of the way tests work on chorus, we need to have a fully
+We need to have a fully
qualified path to all *.ior and *.conf files. We unlink the file
immediately because we use WaitForFileTimed later.
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
index 554e85b8f78..c807fa81806 100755
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
@@ -15,7 +15,7 @@ my $server2 = PerlACE::TestTarget::create_target (2) || die "Create target 2 fai
my $server3 = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n";
my $client = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n";
-$port = $server1->RandomPort () + 10001; # This can't be 10000 on Chorus 4.0
+$port = $server1->RandomPort () + 10001;
$naming_ior = "NameService.ior";
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl
index dd74dc9300d..ec437b6d851 100755
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl
@@ -44,7 +44,7 @@ while (my $argument = shift) {
# Variables for command-line arguments to client and server
# executables.
-$ns_multicast_port = $ns->RandomPort (); # Can not be 10000 on Chorus 4.0
+$ns_multicast_port = $ns->RandomPort ();
$ns_orb_port = 2000 + $ns->RandomPort ();
$ns_ssl_port = 4000 + $ns->RandomPort ();
$nsiorfile = "ns.ior";
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
index 3b2bc6044b6..58c41e2ced3 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
@@ -37,7 +37,7 @@ my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed
# Variables for command-line arguments to client and server
# executables.
-$ns_multicast_port = 10001 + $test->RandomPort(); # Can not be 10000 on Chorus 4.0
+$ns_multicast_port = 10001 + $test->RandomPort();
$ns_orb_port = 12000 + $test->RandomPort();
$iorfile = "ns.ior";
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
index 49299e5a180..894ff5e853a 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
@@ -25,7 +25,7 @@ my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed
# Variables for command-line arguments to client and server
# executables.
$multicast = '224.9.9.2';
-$ns_multicast_port = 10001 + $test->RandomPort(); # Can not be 10000 on Chorus 4.0
+$ns_multicast_port = 10001 + $test->RandomPort();
$ns_orb_port = 12000 + $test->RandomPort();
$iorfile = "ns.ior";
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl
index 3b4ce6bede2..a2755838966 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl
@@ -29,7 +29,7 @@ my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed
# Variables for command-line arguments to client and server
# executables.
-$ns_multicast_port = 10001 + $test->RandomPort(); # Can not be 10000 on Chorus 4.0
+$ns_multicast_port = 10001 + $test->RandomPort();
$iorfile = "ns.ior";
$persistent_ior_file = "pns.ior";
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl
index 9dfb7c9f25d..fce4d76b5bb 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl
@@ -28,7 +28,7 @@ my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed
# Variables for command-line arguments to client and server
# executables.
-$ns_multicast_port = 10001 + $test->RandomPort(); # Can not be 10000 on Chorus 4.0
+$ns_multicast_port = 10001 + $test->RandomPort();
$ns_orb_port = 12000 + $test->RandomPort();
$iorfile = "ns.ior";
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/README b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/README
index 56abcaafcd8..aa4453ddd7d 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/README
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/README
@@ -188,37 +188,3 @@ javac *.java
Run:
java IDL_Cubit_Client
-
-
-Running IDL_Cubit on CHORUS:
---------------------------
-
-1.You should make sure that you set the HOST environment variable on the
-Chorus VME Board to the IP address of that Board before you run
-MT_Cubit test.
-
-e.g.,
-$rsh tambora1 setenv HOST 128.252.165.82
-
-2. You should make sure that the path to IOR file has write permission
-for ALL.
-
-server:
-------
-$rsh host_name arun path_to_server -f path_to_ior_file -ORBDottedDecimalAddresses 1 <server_options>
-
-You DONT have to use -ORBdotteddecimaladdresses 1 if you have
-TAO_USE_DOTTED_DECIMAL_ADDRESSES defined in your config.h file.
-
-e.g.,
-$rsh tambora1 arun /IDL_Cubit/server -f /ior
--ORBDottedDecimalAddresses 1 -ORBObjRefStyle URL
-
-client:
--------
-
-$rsh host_name arun path_to_client -f path_to_ior_file <client_options>
-
-e.g.,
-
-$rsh tambora2 arun /IDL_Cubit/client -f /ior
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/README b/TAO/performance-tests/Cubit/TAO/MT_Cubit/README
index 35ab6b1afe0..fe4c7c4b6c5 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/README
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/README
@@ -175,41 +175,3 @@ RESULTS
The client prints the latency observed by the high priority client,
and the average latency observed by the low priority clients. Jitter
(standard deviation of the latency) is also printed by the client.
-
-
-Running MT_Cubit on CHORUS:
---------------------------
-
-1.You should make sure that you set the HOST environment variable on the
-Chorus VME Board to the IP address of that Board before you run
-MT_Cubit test.
-
-e.g
-$rsh tambora1 setenv HOST 128.252.165.82
-
-2. You should make sure that the path to IOR file has write permission
-for ALL.
-
-server:
-------
-$rsh host_name arun path_to_server -e iiop://DOTTED_DECIMAL_ADDRESS:0
- -f path_to_ior_file -ORBDottedDecimalAddresses 1 <server_options>
-
-Since Chorus doesn't support DNS, you should pass
-dotted_decimal_address of the server machine to -e option.
-
-You DONT have to use -ORBDottedDecimalAddresses 1 if you have
-TAO_USE_DOTTED_DECIMAL_ADDRESSES defined in your config.h file.
-
-e.g
-$rsh tambora1 arun /MT_Cubit/server -e iiop://128.252.165.82:0 -f /ior
--ORBDottedDecimalAddresses 1 -t 10 -ORBObjRefStyle url
-
-client:
--------
-
-$rsh host_name arun path_to_client -f path_to_ior_file <client_options>
-
-e.g
-
-$rsh tambora2 arun /MT_Cubit/client -f /ior -t 10 -n 300
diff --git a/TAO/tests/Alt_Mapping/run_test.pl b/TAO/tests/Alt_Mapping/run_test.pl
index 2f344d4387f..f5ae3dabdcc 100755
--- a/TAO/tests/Alt_Mapping/run_test.pl
+++ b/TAO/tests/Alt_Mapping/run_test.pl
@@ -29,14 +29,13 @@ $status = 0;
for ($i = 0; $i <= $#ARGV; $i++) {
if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
print "Run_Test Perl script for TAO Param Test\n\n";
- print "run_test [-n num] [-d] [-onewin] [-h] [-t type] [-i (dii|sii)] [-chorus <target>]\n";
+ print "run_test [-n num] [-d] [-onewin] [-h] [-t type] [-i (dii|sii)]\n";
print "\n";
print "-n num -- runs the client num times\n";
print "-d -- runs each in debug mode\n";
print "-h -- prints this information\n";
print "-t type -- runs only one type of param test\n";
print "-i (dii|sii) -- Changes the type of invocation\n";
- print "-chorus <target> -- Run tests on chorus target\n";
exit 0;
}
elsif ($ARGV[$i] eq "-n") {
diff --git a/TAO/tests/Bug_2289_Regression/run_test.pl b/TAO/tests/Bug_2289_Regression/run_test.pl
index 9122517317c..ef1e3f3c51c 100755
--- a/TAO/tests/Bug_2289_Regression/run_test.pl
+++ b/TAO/tests/Bug_2289_Regression/run_test.pl
@@ -18,7 +18,7 @@ foreach $i (@ARGV) {
}
# We want the server to run on a fixed port
-$port = PerlACE::uniqueid () + 10001; # This can't be 10000 for Chorus 4.0
+$port = PerlACE::uniqueid () + 10001;
my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
diff --git a/TAO/tests/Bug_3853_Regression/run_test.pl b/TAO/tests/Bug_3853_Regression/run_test.pl
index 97382650711..c4b86f89890 100755
--- a/TAO/tests/Bug_3853_Regression/run_test.pl
+++ b/TAO/tests/Bug_3853_Regression/run_test.pl
@@ -13,8 +13,8 @@ my $server1 = PerlACE::TestTarget::create_target (1) || die "Create target 1 fai
my $server2 = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
my $client = PerlACE::TestTarget::create_target (3) || die "Create target 2 failed\n";
-$port1 = PerlACE::uniqueid () + 10001; # This can't be 10000 for Chorus 4.0
-$port2 = PerlACE::uniqueid () + 10002; # This can't be 10000 for Chorus 4.0
+$port1 = PerlACE::uniqueid () + 10001;
+$port2 = PerlACE::uniqueid () + 10002;
my $iorbase1 = "server1.ior";
my $iorbase2 = "server2.ior";
diff --git a/TAO/tests/DynAny_Test/run_test.pl b/TAO/tests/DynAny_Test/run_test.pl
index 2f7562ff6d6..64e2257e833 100755
--- a/TAO/tests/DynAny_Test/run_test.pl
+++ b/TAO/tests/DynAny_Test/run_test.pl
@@ -28,7 +28,7 @@ sub run_test
for ($i = 0; $i <= $#ARGV; $i++) {
if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
print "Run_Test Perl script for TAO DynAny Test\n\n";
- print "run_test [-chorus <target>] [-t type]\n";
+ print "run_test [-t type]\n";
print "\n";
print "-t type -- runs only one type of dynany test\n";
exit;
diff --git a/TAO/tests/Param_Test/run_test.pl b/TAO/tests/Param_Test/run_test.pl
index 7b89939b0d8..cf031cdf0a9 100755
--- a/TAO/tests/Param_Test/run_test.pl
+++ b/TAO/tests/Param_Test/run_test.pl
@@ -40,14 +40,13 @@ $status = 0;
for ($i = 0; $i <= $#ARGV; $i++) {
if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
print "Run_Test Perl script for TAO Param Test\n\n";
- print "run_test [-n num] [-d] [-onewin] [-h] [-t type] [-i (dii|sii)] [-chorus <target>]\n";
+ print "run_test [-n num] [-d] [-onewin] [-h] [-t type] [-i (dii|sii)]\n";
print "\n";
print "-n num -- runs the client num times\n";
print "-d -- runs each in debug mode\n";
print "-h -- prints this information\n";
print "-t type -- runs only one type of param test\n";
print "-i (dii|sii) -- Changes the type of invocation\n";
- print "-chorus <target> -- Run tests on chorus target\n";
exit 0;
}
elsif ($ARGV[$i] eq "-n") {
View Lorry Controller Status