38 files changed, 38 insertions, 38 deletions

diff --git a/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl b/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl
index 95b6be5ce1f..213364a0ee6 100755
--- a/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl
+++ b/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl
@@ -144,7 +144,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
index b843fd3d104..a4ddacdea36 100755
--- a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
+++ b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
@@ -140,7 +140,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl
index 379be879fbe..181df61274c 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl
index dab14262e1f..cdfb23b9467 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl
index f5831077d1c..a33aa440a7c 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl
@@ -143,7 +143,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
index e527e6ddbcc..c5e7ffd4855 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
index 944dba867b6..9f1ebd63536 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
index 89673146903..764905498b6 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl
index ab49740bf8b..d3ed3f32ef1 100755
--- a/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl
index a2ffa78e823..66131f97fdb 100755
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl
index bf113efd35b..dc0c34941c6 100755
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl
index bf113efd35b..dc0c34941c6 100755
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl
index bf113efd35b..dc0c34941c6 100755
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl
index bf113efd35b..dc0c34941c6 100755
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl
index bf113efd35b..dc0c34941c6 100755
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl
index 79306901592..eb1326705fc 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl
index 3448f09b44c..6f82b757a0a 100755
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl
index 3448f09b44c..6f82b757a0a 100755
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl
index f35debd664e..a6cac2e165a 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl
index bf113efd35b..dc0c34941c6 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl
index f35debd664e..a6cac2e165a 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl
index 7af85d6af09..bbb29e79d89 100755
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl
index 4f6e108fe9f..844ab83201f 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
index 16b1e8cdc28..fba2b49b0c8 100755
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl
index bf113efd35b..dc0c34941c6 100755
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl
index 8bfeb22ab05..7c358cba8bf 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl
index 16b1e8cdc28..fba2b49b0c8 100755
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl
index 16b1e8cdc28..fba2b49b0c8 100755
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl
index 16b1e8cdc28..fba2b49b0c8 100755
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl
index 7af85d6af09..bbb29e79d89 100755
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl
index bf113efd35b..dc0c34941c6 100755
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl
index 3448f09b44c..6f82b757a0a 100755
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl
index c47416e8690..e8e74b5f9e1 100755
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl
index a2ffa78e823..66131f97fdb 100755
--- a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl
@@ -141,7 +141,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/examples/BasicSP/descriptors/run_test.pl b/CIAO/examples/BasicSP/descriptors/run_test.pl
index 4772eb3b148..e64c797cdd4 100755
--- a/CIAO/examples/BasicSP/descriptors/run_test.pl
+++ b/CIAO/examples/BasicSP/descriptors/run_test.pl
@@ -155,7 +155,7 @@ print STDERR "Starting Naming Service with -m 0 -ORBEndpoint iiop://localhost:60
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/examples/Hello/descriptors/run_test.pl b/CIAO/examples/Hello/descriptors/run_test.pl
index 83786a84796..be24cb081f9 100755
--- a/CIAO/examples/Hello/descriptors/run_test.pl
+++ b/CIAO/examples/Hello/descriptors/run_test.pl
@@ -150,7 +150,7 @@ print STDERR "Starting Naming Service with -m 0 -ORBEndpoint iiop://localhost:60
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/examples/Hello/descriptors/run_test_alias.pl b/CIAO/examples/Hello/descriptors/run_test_alias.pl
index c5f56a3ed4b..99ba23c1068 100755
--- a/CIAO/examples/Hello/descriptors/run_test_alias.pl
+++ b/CIAO/examples/Hello/descriptors/run_test_alias.pl
@@ -150,7 +150,7 @@ print STDERR "Starting Naming Service with -m 0 -ORBEndpoint iiop://localhost:60
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;
diff --git a/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl b/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl
index 63f51fd4db1..d6e69f00739 100644
--- a/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl
+++ b/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl
@@ -144,7 +144,7 @@ $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Servic
 
 $ns_status = $NS->Spawn ();
 
-if ($status != 0) {
+if ($ns_status != 0) {
     print STDERR "ERROR: Unable to execute the naming service\n";
     kill_open_processes ();
     exit 1;