Wed Feb 20 11:20:00 2002 Daniel Troesser <troesser_d@ociweb.com>

                * Fixing Bugzilla Bug 1139:

	* tests/RTCORBA/check_supported_priorities.cpp

	  Changed to return a value of 2 when priorities are not supported.

	* tests/RTCORBA/Banded_Connections/run_test.pl
	* tests/RTCORBA/Client_Propagated/run_test.pl
	* tests/RTCORBA/Collocation/Collocation.cpp
	* tests/RTCORBA/Collocation/run_test.pl
	* tests/RTCORBA/Linear_Priority/run_test.pl
        * tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
	* tests/RTCORBA/Policy_Combinations/run_test.pl
	* tests/RTCORBA/Server_Declared/run_test.pl
	* tests/RTCORBA/Thread_Pool/run_test.pl

	  Changed run_test.pl scripts to exit gracefully, without error,
	  if multiple priorities are not supported.

1 files changed, 20 insertions, 15 deletions

diff --git a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
index 7f1f55eb953..9bb314e91d3 100755
--- a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
+++ b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
@@ -41,31 +41,36 @@ if ($^O eq "hpux") {
 $SV = new PerlACE::Process ("server", $server_args);
 $CL = new PerlACE::Process ("client");
 
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile2, 10) == -1) {
+$SV->Spawn();
+$server = $SV->TimedWait(10);
+if ($server == 2) {
+  print STDOUT "Could not change priority levels.  Check user permissions.  Exiting...\n";
+  # Mark as no longer running to avoid errors on exit.
+  $SV->{RUNNING} = 0;
+} else {
+  if (PerlACE::waitforfile_timed ($iorfile2, 10) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile2>\n";
     $SV->Kill ();
     exit 1;
-}
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
+  }
+  
+  $client = $CL->SpawnWaitKill (60);
+  
+  if ($client != 0) {
     print STDERR "ERROR: client returned $client\n";
     $status = 1;
-}
+  }
 
-$server = $SV->WaitKill (30);
-
-if ($server != 0) {
+  $server = $SV->WaitKill (30);
+  
+  if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
     $status = 1;
+  }
+  unlink $iorfile1;
+  unlink $iorfile2;
 }
 
-unlink $iorfile1;
-unlink $iorfile2;
-
 # Clean up SHMIOP files
 PerlACE::check_n_cleanup_files ("server_shmiop_*");